diff --git a/.github/pull.yml b/.github/pull.yml
new file mode 100644
index 000000000000..cba38338ca1b
--- /dev/null
+++ b/.github/pull.yml
@@ -0,0 +1,7 @@
+# https://github.com/wei/pull#advanced-setup-with-config
+version: "1"
+rules:
+  - base: master
+    upstream: Azure:master
+    mergeMethod: rebase
+label: "AutoPull"
diff --git a/README.md b/README.md
index 3a89fec4d97e..a93b2e3fb049 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Each service might have a number of libraries available from each of the followi
 * [Management](#Management)
 
 ### Client: July 2019 Preview
-New wave of packages that we are currently releasing in **preview**. These libraries follow the [Azure SDK Design Guidelines for Java](https://azuresdkspecs.z5.web.core.windows.net/JavaSpec.html) and share a number of core features such as HTTP retries, logging, transport protocols, authentication protocols, etc., so that once you learn how to use these features in one client library, you will know how to use them in other client libraries. You can learn about these shared features [here](core).
+New wave of packages that we are currently releasing in **preview**. These libraries follow the [Azure SDK Design Guidelines for Java](https://azure.github.io/azure-sdk/java/guidelines/) and share a number of core features such as HTTP retries, logging, transport protocols, authentication protocols, etc., so that once you learn how to use these features in one client library, you will know how to use them in other client libraries. You can learn about these shared features [here](core). 
 
 These preview libraries can be easily identified by their folder, package, and namespaces names starting with `azure-`, e.g. `azure-keyvault`.
 
diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
index 3ae4c9aa409d..4fb91b2a5c7e 100644
--- a/eng/.docsettings.yml
+++ b/eng/.docsettings.yml
@@ -75,6 +75,9 @@ known_content_issues:
   - ['sdk/cosmos/changelog/README.md', '#3113']
   - ['sdk/cosmos/microsoft-azure-cosmos-benchmark/README.md', '#3113']
   - ['sdk/cosmos/README.md', '#3113']
+  - ['sdk/storage/azure-storage-blob/swagger/README.md', '#3113']
+  - ['sdk/storage/azure-storage-queue/swagger/README.md', '#3113']
+  - ['sdk/storage/azure-storage-file/swagger/README.md', '#3113']
 package_indexing_exclusion_list:
   - azure-loganalytics-sample
   - azure-applicationinsights-query-sample
diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java
index 85252a28a214..916c7533859f 100644
--- a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java
+++ b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java
@@ -1,5 +1,5 @@
-// Licensed under the MIT License.
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.azure.tools.checkstyle.checks;
 
@@ -19,8 +19,8 @@
  */
 public class OnlyFinalFieldsForImmutableClassCheck extends AbstractCheck {
     private static final String IMMUTABLE_NOTATION = "Immutable";
-    private static final String ERROR_MSG = "The variable field ''%s'' should be final." +
-        "Classes annotated with @Immutable are supposed to be immutable.";
+    private static final String ERROR_MSG = "The variable field ''%s'' should be final."
+        + "Classes annotated with @Immutable are supposed to be immutable.";
 
     private boolean hasImmutableAnnotation;
 
diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java
index 8623828a9c63..417643ccc4f8 100644
--- a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java
+++ b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java
@@ -90,7 +90,7 @@ public void visitToken(DetailAST token) {
                 // method name has prefix 'build' but not 'build*Client' or 'build*AsyncClient'
                 if (!methodName.endsWith("Client")) {
                     log(token, String.format(
-                        "@ServiceClientBuilder class should not have a method name, ''%s'' starting with ''build'' but not ending with ''Client''." , methodName));
+                        "@ServiceClientBuilder class should not have a method name, ''%s'' starting with ''build'' but not ending with ''Client''.", methodName));
                 }
                 break;
             default:
diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java
index 5cc32d5249c2..11ff09b1b760 100644
--- a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java
+++ b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.tools.checkstyle.checks;
 
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
@@ -39,7 +42,7 @@ protected static boolean hasIllegalCombination(DetailAST modifiers) {
         Optional<DetailAST> illegalCombination = TokenUtil.findFirstTokenByPredicate(modifiers, (node) -> {
             final int type = node.getType();
             return INVALID_FINAL_COMBINATION.contains(node.getType()) || (TokenTypes.ANNOTATION == type
-            && INVALID_FINAL_ANNOTATIONS.contains(node.findFirstToken(TokenTypes.IDENT).getText()));
+                && INVALID_FINAL_ANNOTATIONS.contains(node.findFirstToken(TokenTypes.IDENT).getText()));
         });
 
         return illegalCombination.isPresent();
diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
index 553c34ca080f..916cd16a7796 100755
--- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
+++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -112,6 +112,9 @@
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck" files=".*[/\\]samples[/\\].*\.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicyCheck" files=".*[/\\]samples[/\\].*\.java"/>
 
+  <!-- Don't apply custom Checkstyle rules to files under checkstyle package. -->
+  <suppress checks="com\.azure\.tools\.checkstyle\.checks\..+" files=".*[/\\]tools[/\\]checkstyle[/\\].*"/>
+
   <!-- JavaPackage suppression -->
   <suppress checks="JavadocPackage" files=".*[/\\]samples[/\\].*\.java"/>
 
diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
index 6cfdbbd51923..bf64bafa0c43 100755
--- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
+++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -65,6 +65,8 @@
     <Or>
       <Class name="com.microsoft.azure.keyvault.authentication.KeyVaultCredentials"/>
       <Class name="com.azure.storage.blob.implementation.AzureBlobStorageBuilder"/>
+      <Class name="com.azure.storage.file.implementation.AzureFileStorageBuilder"/>
+      <Class name="com.azure.storage.queue.implementation.AzureQueueStorageBuilder"/>
     </Or>
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
   </Match>
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 06ce79cd972c..c468ebd85216 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -56,6 +56,9 @@ jobs:
           JavaVersion: '1.11'
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+
       - script: |
           echo "##vso[build.addbuildtag]Scheduled"
         displayName: 'Tag scheduled builds'
@@ -87,6 +90,9 @@ jobs:
       vmImage: 'ubuntu-16.04'
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+        
       - task: UsePythonVersion@0
         displayName: 'Use Python 3.6'
         inputs:
@@ -222,12 +228,16 @@ jobs:
       vmImage: $(OSVmImage)
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+        
       - template: ../steps/verify-agent-os.yml
         parameters:
           OSName: $(OSName)
 
       - task: Maven@3
         displayName: 'Start Jetty'
+        condition: ne(variables['SdkType'], 'client')
         inputs:
           mavenPomFile: pom.client.xml
           options: '$(DefaultOptions) $(ProfileFlag)'
diff --git a/pom.client.xml b/pom.client.xml
index ce6957bcaeed..525ed2caf70b 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -1,7 +1,7 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azure</groupId>
   <artifactId>azure-client-sdk-parent</artifactId>
@@ -164,12 +164,13 @@
           </dependency>
         </dependencies>
         <configuration>
-          <effort>Max</effort>
+          <effort>max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
           <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
           <excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
           <failOnError>true</failOnError>
+          <fork>false</fork>
         </configuration>
         <executions>
           <execution>
@@ -341,7 +342,6 @@
             </footer>
             <linksource>false</linksource>
             <excludePackageNames>
-              com.microsoft.azure.template:
               *.impl*:
               *.implementation*:
               com.azure.tools.checkstyle*
@@ -401,6 +401,10 @@
                 <title>Azure Storage - Queues</title>
                 <packages>com.azure.storage.queue*</packages>
               </group>
+              <group>
+                <title>Azure Telemetry</title>
+                <packages>com.azure.tracing.opentelemetry*</packages>
+              </group>
             </groups>
             <links>
               <link>https://docs.oracle.com/javase/8/docs/api/</link>
@@ -438,12 +442,13 @@
             </dependency>
           </dependencies>
           <configuration>
-            <effort>Max</effort>
+            <effort>max</effort>
             <threshold>Low</threshold>
             <xmlOutput>true</xmlOutput>
             <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
             <excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
             <failOnError>true</failOnError>
+            <fork>false</fork>
           </configuration>
         </plugin>
 
@@ -511,12 +516,13 @@
         <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${spotbugs.maven.version}</version>
         <configuration>
-          <effort>Max</effort>
+          <effort>max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
           <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
           <excludeFilterFile>eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml</excludeFilterFile>
           <failOnError>true</failOnError>
+          <fork>false</fork>
         </configuration>
       </plugin>
       <plugin>
@@ -724,12 +730,13 @@
         <module>./eng/jacoco-test-coverage</module>
       </modules>
     </profile>
-
+    
     <profile>
       <id>template-module</id>
       <activation>
         <property>
-          <name>include-template</name>
+          <name>env.ENABLETEMPLATEDOCS</name>
+          <value>true</value>
         </property>
       </activation>
       <modules>
diff --git a/pom.data.xml b/pom.data.xml
index b29bea93bc9d..c4f136e43183 100644
--- a/pom.data.xml
+++ b/pom.data.xml
@@ -545,7 +545,7 @@
     <module>./sdk/cosmos</module>
     <module>./sdk/eventhubs/pom.data.xml</module>
     <module>./sdk/keyvault/pom.data.xml</module>
-    <module>./sdk/servicebus/azure-servicebus</module>
+    <module>./sdk/servicebus/microsoft-azure-servicebus</module>
     <module>./sdk/storage/microsoft-azure-storage-blob</module>
   </modules>
 </project>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
index b071a586319d..a3a6c04861ec 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
@@ -49,13 +49,13 @@
  * the Event Hubs namespace and offers operations for sending event data, receiving events, and inspecting the connected
  * Event Hub.
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using an Event Hubs namespace connection string</strong></p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string}
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub instance connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using an Event Hub instance connection string</strong></p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string}
  *
  * @see EventHubClientBuilder
  * @see <a href="https://docs.microsoft.com/Azure/event-hubs/event-hubs-about">About Azure Event Hubs</a>
@@ -236,20 +236,22 @@ public EventHubAsyncConsumer createConsumer(String consumerGroup, String partiti
      * @param options The set of options to apply when creating the consumer.
      * @return An new {@link EventHubAsyncConsumer} that receives events from the partition with all configured {@link
      *         EventHubConsumerOptions}.
-     * @throws NullPointerException If {@code eventPosition}, or {@code options} is {@code null}.
-     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is {@code null} or an
-     *         empty string.
+     * @throws NullPointerException If {@code eventPosition}, {@code consumerGroup}, {@code partitionId}, or {@code
+     *     options} is {@code null}.
+     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is an empty string.
      */
     public EventHubAsyncConsumer createConsumer(String consumerGroup, String partitionId, EventPosition eventPosition,
                                                 EventHubConsumerOptions options) {
         Objects.requireNonNull(eventPosition);
         Objects.requireNonNull(options);
+        Objects.requireNonNull(consumerGroup);
+        Objects.requireNonNull(partitionId);
 
         if (ImplUtils.isNullOrEmpty(consumerGroup)) {
-            throw new IllegalArgumentException("'consumerGroup' cannot be null or empty.");
+            throw new IllegalArgumentException("'consumerGroup' cannot be an empty string.");
         }
         if (ImplUtils.isNullOrEmpty(partitionId)) {
-            throw new IllegalArgumentException("'partitionId' cannot be null or empty.");
+            throw new IllegalArgumentException("'partitionId' cannot be an empty string.");
         }
 
         final EventHubConsumerOptions clonedOptions = options.clone();
@@ -268,8 +270,6 @@ public EventHubAsyncConsumer createConsumer(String consumerGroup, String partiti
             return connection.createSession(entityPath).cast(EventHubSession.class);
         }).flatMap(session -> {
             logger.verbose("Creating consumer for path: {}", entityPath);
-
-            logger.verbose("Creating producer for {}", entityPath);
             final RetryPolicy retryPolicy = RetryUtil.getRetryPolicy(clonedOptions.retry());
 
             return session.createConsumer(linkName, entityPath, getExpression(eventPosition),
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java
index e4626ddf7045..ca3eeef4db77 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java
@@ -90,6 +90,7 @@
  * same partition because they all share the same {@link BatchOptions#partitionKey()}.
  * <p>
  * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncproducer.send#eventDataBatch}
+ *
  * @see EventHubAsyncClient#createProducer()
  */
 @Immutable
@@ -166,10 +167,13 @@ public Mono<EventDataBatch> createBatch(BatchOptions options) {
     /**
      * Sends a single event to the associated Event Hub. If the size of the single event exceeds the maximum size
      * allowed, an exception will be triggered and the send will fail.
+
      * <p>
      * For more information regarding the maximum event size allowed, see
      * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
      * Limits</a>.
+     * </p>
+     *
      * @param event Event to send to the service.
      *
      * @return A {@link Mono} that completes when the event is pushed to the service.
@@ -183,11 +187,13 @@ public Mono<Void> send(EventData event) {
     /**
      * Sends a single event to the associated Event Hub with the send options. If the size of the single event exceeds
      * the maximum size allowed, an exception will be triggered and the send will fail.
+     *
      * <p>
      * For more information regarding the maximum event size allowed, see
      * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
      * Limits</a>.
-     * @param event   Event to send to the service.
+     * </p>
+     * @param event Event to send to the service.
      * @param options The set of options to consider when sending this event.
      *
      * @return A {@link Mono} that completes when the event is pushed to the service.
@@ -217,7 +223,7 @@ public Mono<Void> send(Iterable<EventData> events) {
      * Sends a set of events to the associated Event Hub using a batched approach. If the size of events exceed the
      * maximum size of a single batch, an exception will be triggered and the send will fail. By default, the message
      * size is the max amount allowed on the link.
-     * @param events  Events to send to the service.
+     * @param events Events to send to the service.
      * @param options The set of options to consider when sending this batch.
      *
      * @return A {@link Mono} that completes when all events are pushed to the service.
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
new file mode 100644
index 000000000000..031113295187
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
@@ -0,0 +1,184 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.RetryOptions;
+import com.azure.core.http.rest.IterableResponse;
+import com.azure.core.implementation.annotation.ReturnType;
+import com.azure.core.implementation.annotation.ServiceClient;
+import com.azure.core.implementation.annotation.ServiceMethod;
+import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+
+import java.io.Closeable;
+import java.time.Duration;
+import java.util.Objects;
+
+/**
+ * The main point of interaction with Azure Event Hubs, the client offers a connection to a specific Event Hub within
+ * the Event Hubs namespace and offers operations for sending event data, receiving events, and inspecting the connected
+ * Event Hub.
+ *
+ * <p>
+ * <strong>Creating a synchronous {@link EventHubClient} using an Event Hub instance connection string</strong>
+ * </p>
+ *
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubclient.instantiation}
+ *
+ * @see EventHubClientBuilder
+ * @see EventHubAsyncClient To communicate with Event Hub using an asynchronous client.
+ * @see <a href="https://docs.microsoft.com/Azure/event-hubs/event-hubs-about">About Azure Event Hubs</a>
+ */
+@ServiceClient(builder = EventHubClientBuilder.class)
+public class EventHubClient implements Closeable {
+    private final EventHubAsyncClient client;
+    private final RetryOptions retry;
+    private final EventHubProducerOptions defaultProducerOptions;
+    private final EventHubConsumerOptions defaultConsumerOptions;
+
+    EventHubClient(EventHubAsyncClient client, ConnectionOptions connectionOptions) {
+        Objects.requireNonNull(connectionOptions);
+
+        this.client = Objects.requireNonNull(client);
+        this.retry = connectionOptions.retry();
+        this.defaultProducerOptions = new EventHubProducerOptions()
+            .retry(connectionOptions.retry());
+        this.defaultConsumerOptions = new EventHubConsumerOptions()
+            .retry(connectionOptions.retry())
+            .scheduler(connectionOptions.scheduler());
+    }
+
+    /**
+     * Retrieves information about an Event Hub, including the number of partitions present and their identifiers.
+     *
+     * @return The set of information for the Event Hub that this client is associated with.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public EventHubProperties getProperties() {
+        return client.getProperties().block(retry.tryTimeout());
+    }
+
+    /**
+     * Retrieves the identifiers for all the partitions of an Event Hub.
+     *
+     * @return The identifiers for all partitions of an Event Hub.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public IterableResponse<String> getPartitionIds() {
+        return new IterableResponse<>(client.getPartitionIds());
+    }
+
+    /**
+     * Retrieves information about a specific partition for an Event Hub, including elements that describe the available
+     * events in the partition event stream.
+     *
+     * @param partitionId The unique identifier of a partition associated with the Event Hub.
+     * @return The information for the requested partition under the Event Hub this client is associated with.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public PartitionProperties getPartitionProperties(String partitionId) {
+        return client.getPartitionProperties(partitionId).block(retry.tryTimeout());
+    }
+
+    /**
+     * Creates an Event Hub producer responsible for transmitting {@link EventData} to the Event Hub, grouped together
+     * in batches. Event data is automatically routed to an available partition.
+     *
+     * @return A new {@link EventHubProducer}.
+     */
+    public EventHubProducer createProducer() {
+        return createProducer(defaultProducerOptions);
+    }
+
+    /**
+     * Creates an Event Hub producer responsible for transmitting {@link EventData} to the Event Hub, grouped together
+     * in batches. If {@link EventHubProducerOptions#partitionId() options.partitionId()} is not {@code null}, the
+     * events are routed to that specific partition. Otherwise, events are automatically routed to an available
+     * partition.
+     *
+     * @param options The set of options to apply when creating the producer.
+     * @return A new {@link EventHubProducer}.
+     * @throws NullPointerException if {@code options} is {@code null}.
+     */
+    public EventHubProducer createProducer(EventHubProducerOptions options) {
+        Objects.requireNonNull(options);
+
+        final EventHubAsyncProducer producer = client.createProducer(options);
+
+        final Duration tryTimeout = options.retry() != null && options.retry().tryTimeout() != null
+            ? options.retry().tryTimeout()
+            : defaultProducerOptions.retry().tryTimeout();
+
+        return new EventHubProducer(producer, tryTimeout);
+    }
+
+    /**
+     * Creates an Event Hub consumer responsible for reading {@link EventData} from a specific Event Hub partition, as a
+     * member of the specified consumer group, and begins reading events from the {@code eventPosition}.
+     *
+     * The consumer created is non-exclusive, allowing multiple consumers from the same consumer group to be actively
+     * reading events from the partition. These non-exclusive consumers are sometimes referred to as "Non-epoch
+     * Consumers".
+     *
+     * @param consumerGroup The name of the consumer group this consumer is associated with. Events are read in the
+     *     context of this group. The name of the consumer group that is created by default is {@link
+     *     EventHubAsyncClient#DEFAULT_CONSUMER_GROUP_NAME "$Default"}.
+     * @param partitionId The identifier of the Event Hub partition.
+     * @param eventPosition The position within the partition where the consumer should begin reading events.
+     * @return A new {@link EventHubConsumer} that receives events from the partition at the given position.
+     * @throws NullPointerException If {@code eventPosition}, {@code consumerGroup}, {@code partitionId}, or {@code
+     *     options} is {@code null}.
+     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is an empty string.
+     */
+    public EventHubConsumer createConsumer(String consumerGroup, String partitionId, EventPosition eventPosition) {
+        final EventHubAsyncConsumer consumer = client.createConsumer(consumerGroup, partitionId, eventPosition);
+        return new EventHubConsumer(consumer, defaultConsumerOptions);
+    }
+
+    /**
+     * Creates an Event Hub consumer responsible for reading {@link EventData} from a specific Event Hub partition, as a
+     * member of the configured consumer group, and begins reading events from the specified {@code eventPosition}.
+     *
+     * <p>
+     * A consumer may be exclusive, which asserts ownership over the partition for the consumer group to ensure that
+     * only one consumer from that group is reading from the partition. These exclusive consumers are sometimes referred
+     * to as "Epoch Consumers."
+     *
+     * A consumer may also be non-exclusive, allowing multiple consumers from the same consumer group to be actively
+     * reading events from the partition. These non-exclusive consumers are sometimes referred to as "Non-epoch
+     * Consumers."
+     *
+     * Designating a consumer as exclusive may be specified in the {@code options}, by setting {@link
+     * EventHubConsumerOptions#ownerLevel(Long)} to a non-null value. By default, consumers are created as
+     * non-exclusive.
+     * </p>
+     *
+     * @param consumerGroup The name of the consumer group this consumer is associated with. Events are read in the
+     *     context of this group. The name of the consumer group that is created by default is {@link
+     *     EventHubAsyncClient#DEFAULT_CONSUMER_GROUP_NAME "$Default"}.
+     * @param partitionId The identifier of the Event Hub partition from which events will be received.
+     * @param eventPosition The position within the partition where the consumer should begin reading events.
+     * @param options The set of options to apply when creating the consumer.
+     * @return An new {@link EventHubConsumer} that receives events from the partition with all configured {@link
+     *     EventHubConsumerOptions}.
+     * @throws NullPointerException If {@code eventPosition}, {@code consumerGroup}, {@code partitionId}, or {@code
+     *     options} is {@code null}.
+     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is an empty string.
+     */
+    public EventHubConsumer createConsumer(String consumerGroup, String partitionId, EventPosition eventPosition,
+                                           EventHubConsumerOptions options) {
+        final EventHubAsyncConsumer consumer = client.createConsumer(consumerGroup, partitionId, eventPosition, options);
+        return new EventHubConsumer(consumer, options);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void close() {
+        client.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
index 8fd54fc4b773..cdd80c591111 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
@@ -41,27 +41,27 @@
  * #credential(String, String, TokenCredential)}, is required in order to construct an {@link EventHubAsyncClient}.
  * </p>
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong></p>
- *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string}
- *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub instance connection string</strong></p>
+ * <p>
+ * <strong>Creating an asynchronous {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong>
+ * </p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string}
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub with no retry, different timeout and new
- * Scheduler</strong></p>
+ * <p>
+ * <strong>Creating a synchronous {@link EventHubClient} using an Event Hub instance connection string</strong>
+ * </p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.retry-timeout-scheduler}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubclient.instantiation}
  *
- * <p><strong>Creating an {@link EventProcessor} instance using Event Hub instance connection
- *  string</strong></p>
+ * <p>
+ * <strong>Creating an {@link EventProcessor} using Event Hub instance connection string</strong>
+ * </p>
  * {@codesnippet com.azure.messaging.eventhubs.eventprocessor.instantiation}
  *
  * @see EventHubAsyncClient
  * @see EventProcessor
  */
-@ServiceClientBuilder(serviceClients = {EventHubAsyncClient.class, EventProcessor.class})
+@ServiceClientBuilder(serviceClients = {EventHubAsyncClient.class, EventHubClient.class, EventProcessor.class})
 public class EventHubClientBuilder {
 
     private static final String AZURE_EVENT_HUBS_CONNECTION_STRING = "AZURE_EVENT_HUBS_CONNECTION_STRING";
@@ -277,74 +277,44 @@ public EventHubClientBuilder retry(RetryOptions retryOptions) {
      *         specified but the transport type is not {@link TransportType#AMQP_WEB_SOCKETS web sockets}.
      */
     public EventHubAsyncClient buildAsyncClient() {
-        configuration = configuration == null ? ConfigurationManager.getConfiguration().clone() : configuration;
-
-        if (credentials == null) {
-            final String connectionString = configuration.get(AZURE_EVENT_HUBS_CONNECTION_STRING);
-
-            if (ImplUtils.isNullOrEmpty(connectionString)) {
-                throw new IllegalArgumentException("Credentials have not been set using 'EventHubClientBuilder.credentials(String)'"
-                    + "EventHubClientBuilder.credentials(String, String, TokenCredential). And the connection string is"
-                    + "not set in the '" + AZURE_EVENT_HUBS_CONNECTION_STRING + "' environment variable.");
-            }
-
-            connectionString(connectionString);
-        }
-
-        if (retryOptions == null) {
-            retryOptions = DEFAULT_RETRY;
-        }
-
-        // If the proxy has been configured by the user but they have overridden the TransportType with something that
-        // is not AMQP_WEB_SOCKETS.
-        if (proxyConfiguration != null && proxyConfiguration.isProxyAddressConfigured()
-            && transport != TransportType.AMQP_WEB_SOCKETS) {
-            throw new IllegalArgumentException("Cannot use a proxy when TransportType is not AMQP.");
-        }
-
-        if (proxyConfiguration == null) {
-            proxyConfiguration = getDefaultProxyConfiguration(configuration);
-        }
-
-        if (scheduler == null) {
-            scheduler = Schedulers.elastic();
-        }
-
+        final ConnectionOptions connectionOptions = getConnectionOptions();
         final ReactorProvider provider = new ReactorProvider();
         final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(provider);
-        final CBSAuthorizationType authorizationType = credentials instanceof EventHubSharedAccessKeyCredential
-            ? CBSAuthorizationType.SHARED_ACCESS_SIGNATURE
-            : CBSAuthorizationType.JSON_WEB_TOKEN;
-        final ConnectionOptions parameters = new ConnectionOptions(host, eventHubName, credentials, authorizationType,
-            transport, retryOptions, proxyConfiguration, scheduler);
 
-        return new EventHubAsyncClient(parameters, provider, handlerProvider);
+        return new EventHubAsyncClient(connectionOptions, provider, handlerProvider);
     }
 
-    private ProxyConfiguration getDefaultProxyConfiguration(Configuration configuration) {
-        ProxyAuthenticationType authentication = ProxyAuthenticationType.NONE;
-        if (proxyConfiguration != null) {
-            authentication = proxyConfiguration.authentication();
-        }
-
-        String proxyAddress = configuration.get(BaseConfigurations.HTTP_PROXY);
-
-        if (ImplUtils.isNullOrEmpty(proxyAddress)) {
-            return ProxyConfiguration.SYSTEM_DEFAULTS;
-        }
-
-        final String[] hostPort = proxyAddress.split(":");
-        if (hostPort.length < 2) {
-            throw new IllegalArgumentException("HTTP_PROXY cannot be parsed into a proxy");
-        }
-
-        final String host = hostPort[0];
-        final int port = Integer.parseInt(hostPort[1]);
-        final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
-        final String username = configuration.get(ProxyConfiguration.PROXY_USERNAME);
-        final String password = configuration.get(ProxyConfiguration.PROXY_PASSWORD);
+    /**
+     * Creates a new {@link EventHubClient} based on options set on this builder. Every time {@code buildClient()}
+     * is invoked, a new instance of {@link EventHubClient} is created.
+     *
+     * <p>
+     * The following options are used if ones are not specified in the builder:
+     *
+     * <ul>
+     * <li>If no configuration is specified, the {@link ConfigurationManager#getConfiguration() global configuration}
+     * is used to provide any shared configuration values. The configuration values read are the {@link
+     * BaseConfigurations#HTTP_PROXY}, {@link ProxyConfiguration#PROXY_USERNAME}, and {@link
+     * ProxyConfiguration#PROXY_PASSWORD}.</li>
+     * <li>If no retry is specified, the default retry options are used.</li>
+     * <li>If no proxy is specified, the builder checks the {@link ConfigurationManager#getConfiguration() global
+     * configuration} for a configured proxy, then it checks to see if a system proxy is configured.</li>
+     * <li>If no timeout is specified, a {@link ClientConstants#OPERATION_TIMEOUT timeout of one minute} is used.</li>
+     * <li>If no scheduler is specified, an {@link Schedulers#elastic() elastic scheduler} is used.</li>
+     * </ul>
+     *
+     * @return A new {@link EventHubClient} instance with all the configured options.
+     * @throws IllegalArgumentException if the credentials have not been set using either {@link
+     *         #connectionString(String)} or {@link #credential(String, String, TokenCredential)}. Or, if a proxy is
+     *         specified but the transport type is not {@link TransportType#AMQP_WEB_SOCKETS web sockets}.
+     */
+    public EventHubClient buildClient() {
+        final ConnectionOptions connectionOptions = getConnectionOptions();
+        final ReactorProvider provider = new ReactorProvider();
+        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(provider);
+        final EventHubAsyncClient client = new EventHubAsyncClient(connectionOptions, provider, handlerProvider);
 
-        return new ProxyConfiguration(authentication, proxy, username, password);
+        return new EventHubClient(client, connectionOptions);
     }
 
     /**
@@ -429,4 +399,72 @@ public EventProcessor buildEventProcessor() {
         return new EventProcessor(buildAsyncClient(), this.consumerGroupName,
             this.partitionProcessorFactory, initialEventPosition, partitionManager, eventHubName);
     }
+
+    private ConnectionOptions getConnectionOptions() {
+        configuration = configuration == null ? ConfigurationManager.getConfiguration().clone() : configuration;
+
+        if (credentials == null) {
+            final String connectionString = configuration.get(AZURE_EVENT_HUBS_CONNECTION_STRING);
+
+            if (ImplUtils.isNullOrEmpty(connectionString)) {
+                throw new IllegalArgumentException("Credentials have not been set using 'EventHubClientBuilder.credentials(String)'"
+                    + "EventHubClientBuilder.credentials(String, String, TokenCredential). And the connection string is"
+                    + "not set in the '" + AZURE_EVENT_HUBS_CONNECTION_STRING + "' environment variable.");
+            }
+
+            connectionString(connectionString);
+        }
+
+        if (retryOptions == null) {
+            retryOptions = DEFAULT_RETRY;
+        }
+
+        // If the proxy has been configured by the user but they have overridden the TransportType with something that
+        // is not AMQP_WEB_SOCKETS.
+        if (proxyConfiguration != null && proxyConfiguration.isProxyAddressConfigured()
+            && transport != TransportType.AMQP_WEB_SOCKETS) {
+            throw new IllegalArgumentException("Cannot use a proxy when TransportType is not AMQP.");
+        }
+
+        if (proxyConfiguration == null) {
+            proxyConfiguration = getDefaultProxyConfiguration(configuration);
+        }
+
+        if (scheduler == null) {
+            scheduler = Schedulers.elastic();
+        }
+
+        final CBSAuthorizationType authorizationType = credentials instanceof EventHubSharedAccessKeyCredential
+            ? CBSAuthorizationType.SHARED_ACCESS_SIGNATURE
+            : CBSAuthorizationType.JSON_WEB_TOKEN;
+
+        return new ConnectionOptions(host, eventHubName, credentials, authorizationType,
+            transport, retryOptions, proxyConfiguration, scheduler);
+    }
+
+    private ProxyConfiguration getDefaultProxyConfiguration(Configuration configuration) {
+        ProxyAuthenticationType authentication = ProxyAuthenticationType.NONE;
+        if (proxyConfiguration != null) {
+            authentication = proxyConfiguration.authentication();
+        }
+
+        String proxyAddress = configuration.get(BaseConfigurations.HTTP_PROXY);
+
+        if (ImplUtils.isNullOrEmpty(proxyAddress)) {
+            return ProxyConfiguration.SYSTEM_DEFAULTS;
+        }
+
+        final String[] hostPort = proxyAddress.split(":");
+        if (hostPort.length < 2) {
+            throw new IllegalArgumentException("HTTP_PROXY cannot be parsed into a proxy");
+        }
+
+        final String host = hostPort[0];
+        final int port = Integer.parseInt(hostPort[1]);
+        final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
+        final String username = configuration.get(ProxyConfiguration.PROXY_USERNAME);
+        final String password = configuration.get(ProxyConfiguration.PROXY_PASSWORD);
+
+        return new ProxyConfiguration(authentication, proxy, username, password);
+    }
 }
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
new file mode 100644
index 000000000000..7650df110601
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.http.rest.IterableResponse;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import reactor.core.publisher.Flux;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Objects;
+
+/**
+ * A consumer responsible for reading {@link EventData} from a specific Event Hub partition in the context of a specific
+ * consumer group.
+ *
+ * <ul>
+ * <li>If {@link EventHubConsumer} is created where {@link EventHubConsumerOptions#ownerLevel()} has a
+ * value, then Event Hubs service will guarantee only one active consumer exists per partitionId and consumer group
+ * combination. This consumer is sometimes referred to as an "Epoch Consumer."</li>
+ * <li>Multiple consumers per partitionId and consumer group combination can be created by not setting
+ * {@link EventHubConsumerOptions#ownerLevel()} when creating consumers. This non-exclusive consumer is sometimes
+ * referred to as a "Non-Epoch Consumer."</li>
+ * </ul>
+ *
+ * @see EventHubClient#createConsumer(String, String, EventPosition)
+ * @see EventHubClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)
+ */
+public class EventHubConsumer implements Closeable {
+    private final EventHubAsyncConsumer consumer;
+    private final EventHubConsumerOptions options;
+
+    EventHubConsumer(EventHubAsyncConsumer consumer, EventHubConsumerOptions options) {
+        this.consumer = Objects.requireNonNull(consumer);
+        this.options = Objects.requireNonNull(options);
+
+        //TODO (conniey): Keep track of the last sequence number as each method invoked.
+        this.consumer.receive().windowTimeout(options.prefetchCount(), this.options.retry().tryTimeout());
+    }
+
+    /**
+     * Receives a batch of EventData from the Event Hub partition.
+     *
+     * @param maximumMessageCount The maximum number of messages to receive in this batch.
+     * @return A set of {@link EventData} that was received. The iterable contains up to {@code maximumMessageCount}
+     *     events.
+     */
+    public IterableResponse<EventData> receive(int maximumMessageCount) {
+        return new IterableResponse<>(Flux.empty());
+    }
+
+    /**
+     * Receives a batch of EventData from the Event Hub partition
+     *
+     * @param maximumMessageCount The maximum number of messages to receive in this batch.
+     * @param maximumWaitTime The maximum amount of time to wait to build up the requested message count for the
+     *     batch; if not specified, the default wait time specified when the consumer was created will be used.
+     * @return A set of {@link EventData} that was received. The iterable contains up to {@code maximumMessageCount}
+     *     events.
+     */
+    public IterableResponse<EventData> receive(int maximumMessageCount, Duration maximumWaitTime) {
+        return new IterableResponse<>(Flux.empty());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void close() throws IOException {
+        consumer.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
new file mode 100644
index 000000000000..d71484492a9f
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
@@ -0,0 +1,198 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.implementation.annotation.Immutable;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Objects;
+
+/**
+ * A producer responsible for transmitting {@link EventData} to a specific Event Hub, grouped together in batches.
+ * Depending on the options specified at creation, the producer may be created to allow event data to be automatically
+ * routed to an available partition or specific to a partition.
+ *
+ * <p>
+ * Allowing automatic routing of partitions is recommended when:
+ * <ul>
+ * <li>The sending of events needs to be highly available.</li>
+ * <li>The event data should be evenly distributed among all available partitions.</li>
+ * </ul>
+ * </p>
+ *
+ * <p>
+ * If no partition is specified, the following rules are used for automatically selecting one:
+ * <ol>
+ * <li>Distribute the events equally amongst all available partitions using a round-robin approach.</li>
+ * <li>If a partition becomes unavailable, the Event Hubs service will automatically detect it and forward the
+ * message to another available partition.</li>
+ * </ol>
+ * </p>
+ *
+ * <p><strong>Create a producer that routes events to any partition</strong></p>
+ * To allow automatic routing of messages to available partition, do not specify the {@link
+ * EventHubProducerOptions#partitionId() partitionId} when creating the {@link EventHubProducer}.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.instantiation}
+ *
+ * <p><strong>Create a producer that publishes events to partition "foo" with a timeout of 45 seconds.</strong></p>
+ * <p>
+ * Developers can push events to a single partition by specifying the {@link EventHubProducerOptions#partitionId(String)
+ * partitionId} when creating an {@link EventHubProducer}.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.instantiation#partitionId}
+ *
+ * <p><strong>Publish events to the same partition, grouped together using {@link SendOptions#partitionKey(String)}.</strong></p>
+ * <p>
+ * If developers want to push similar events to end up at the same partition, but do not require them to go to a
+ * specific partition, they can use {@link SendOptions#partitionKey(String)}.
+ * <p>
+ * In the sample below, all the "sandwiches" end up in the same partition, but it could end up in partition 0, 1, etc.
+ * of the available partitions. All that matters to the end user is that they are grouped together.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.send#publisher-sendOptions}
+ *
+ * <p><strong>Publish events using an {@link EventDataBatch}.</strong></p>
+ * <p>
+ * Developers can create an {@link EventDataBatch}, add the events they want into it, and publish these events together.
+ * When creating a {@link EventDataBatch batch}, developers can specify a set of {@link BatchOptions options} to
+ * configure this batch.
+ * <p>
+ * In the scenario below, the developer is creating a networked video game. They want to receive telemetry about their
+ * users' gaming systems, but do not want to slow down the network with telemetry. So they limit the size of their
+ * {@link EventDataBatch batches} to be no larger than 256 bytes. The events within the batch also get hashed to the
+ * same partition because they all share the same {@link BatchOptions#partitionKey()}.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.send#eventDataBatch}
+ *
+ * @see EventHubClient#createProducer()
+ * @see EventHubAsyncProducer To asynchronously generate events to an Event Hub, see EventHubAsyncProducer.
+ */
+@Immutable
+public class EventHubProducer implements Closeable {
+    private final EventHubAsyncProducer producer;
+    private final Duration tryTimeout;
+
+    /**
+     * Creates a new instance of {@link EventHubProducer} that sends messages to an Azure Event Hub.
+     *
+     * @throws NullPointerException if {@code producer} or {@code tryTimeout} is null.
+     */
+    EventHubProducer(EventHubAsyncProducer producer, Duration tryTimeout) {
+        this.producer = Objects.requireNonNull(producer);
+        this.tryTimeout = Objects.requireNonNull(tryTimeout);
+    }
+
+    /**
+     * Creates an {@link EventDataBatch} that can fit as many events as the transport allows.
+     *
+     * @return A new {@link EventDataBatch} that can fit as many events as the transport allows.
+     */
+    public EventDataBatch createBatch() {
+        return producer.createBatch().block(tryTimeout);
+    }
+
+    /**
+     * Creates an {@link EventDataBatch} that can fit as many events as the transport allows.
+     *
+     * @param options A set of options used to configure the {@link EventDataBatch}.
+     * @return A new {@link EventDataBatch} that can fit as many events as the transport allows.
+     */
+    public EventDataBatch createBatch(BatchOptions options) {
+        return producer.createBatch(options).block(tryTimeout);
+    }
+
+    /**
+     * Sends a single event to the associated Event Hub. If the size of the single event exceeds the maximum size
+     * allowed, an exception will be triggered and the send will fail.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param event Event to send to the service.
+     */
+    public void send(EventData event) {
+        producer.send(event).block();
+    }
+
+    /**
+     * Sends a single event to the associated Event Hub with the send options. If the size of the single event exceeds
+     * the maximum size allowed, an exception will be triggered and the send will fail.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param event Event to send to the service.
+     * @param options The set of options to consider when sending this event.
+     */
+    public void send(EventData event, SendOptions options) {
+        producer.send(event, options).block();
+    }
+
+    /**
+     * Sends a set of events to the associated Event Hub using a batched approach. If the size of events exceed the
+     * maximum size of a single batch, an exception will be triggered and the send will fail. By default, the message
+     * size is the max amount allowed on the link.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param events Events to send to the service.
+     */
+    public void send(Iterable<EventData> events) {
+        producer.send(events).block();
+    }
+
+    /**
+     * Sends a set of events to the associated Event Hub using a batched approach. If the size of events exceed the
+     * maximum size of a single batch, an exception will be triggered and the send will fail. By default, the message
+     * size is the max amount allowed on the link.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param events Events to send to the service.
+     * @param options The set of options to consider when sending this batch.
+     */
+    public void send(Iterable<EventData> events, SendOptions options) {
+        producer.send(events, options).block();
+    }
+
+    /**
+     * Sends the batch to the associated Event Hub.
+     *
+     * @param batch The batch to send to the service.
+     * @throws NullPointerException if {@code batch} is {@code null}.
+     * @see EventHubProducer#createBatch()
+     * @see EventHubProducer#createBatch(BatchOptions)
+     */
+    public void send(EventDataBatch batch) {
+        producer.send(batch).block();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void close() throws IOException {
+        producer.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java
index 89f7b0f63257..2f33f372ba32 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java
@@ -51,6 +51,11 @@ public static void main(String[] args) throws InterruptedException, IOException
         // TimeoutException is thrown.
         String firstPartition = client.getPartitionIds().blockFirst(OPERATION_TIMEOUT);
 
+        // This shouldn't happen, but if we are unable to get the partitions within the timeout period.
+        if (firstPartition == null) {
+            firstPartition = "0";
+        }
+
         // Create a consumer.
         // The "$Default" consumer group is created by default. This value can be found by going to the Event Hub
         // instance you are connecting to, and selecting the "Consumer groups" page. EventPosition.latest() tells the
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java
index 99b1b75dfa20..796a0738b6c7 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java
@@ -3,11 +3,6 @@
 
 package com.azure.messaging.eventhubs;
 
-import com.azure.core.amqp.RetryOptions;
-import reactor.core.scheduler.Schedulers;
-
-import java.time.Duration;
-
 /**
  * Contains code snippets when generating javadocs through doclets for {@link EventHubAsyncClient}.
  */
@@ -17,15 +12,15 @@ public class EventHubAsyncClientJavaDocCodeSamples {
      * Creating an {@link EventHubAsyncClient} using an Event Hubs namespace connection string with an Event Hub name.
      */
     public void instantiation() {
-        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string
+        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
-            + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
+            + "SharedAccessKey={sharedAccessKey}";
         String eventHubName = "my-event-hub";
 
         EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString, eventHubName)
             .buildAsyncClient();
-        // END: com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string
+        // END: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string
 
         client.close();
     }
@@ -34,34 +29,14 @@ public void instantiation() {
      * Creating an {@link EventHubAsyncClient} using a connection string specific to an Event Hub instance.
      */
     public void instantiationInstance() {
-        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string
-        String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
-            + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
-
-        EventHubAsyncClient client = new EventHubClientBuilder()
-            .connectionString(connectionString)
-            .buildAsyncClient();
-        // END: com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string
-
-        client.close();
-    }
-
-    /**
-     * Demonstrates an {@link EventHubClientBuilder} using retry, timeout and a different scheduler.
-     */
-    public void instantiationRetry() {
-        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.retry-timeout-scheduler
+        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
             + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
 
-        RetryOptions retryOptions = new RetryOptions()
-            .tryTimeout(Duration.ofSeconds(30));
         EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
-            .retry(retryOptions)
-            .scheduler(Schedulers.newElastic("dedicated-event-hub-scheduler"))
             .buildAsyncClient();
-        // END: com.azure.messaging.eventhubs.eventhubasyncclient.retry-timeout-scheduler
+        // END: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string
 
         client.close();
     }
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java
index 1c00ee7e23e5..f176ebb2825e 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java
@@ -22,7 +22,8 @@ public class EventHubAsyncProducerJavaDocCodeSamples {
     private final EventHubAsyncClient client = new EventHubClientBuilder().connectionString("fake-string").buildAsyncClient();
 
     /**
-     * Code snippet demonstrating how to create an EventHubProducer that automatically routes events to any partition.
+     * Code snippet demonstrating how to create an {@link EventHubAsyncProducer} that automatically routes events to any
+     * partition.
      *
      * @throws IOException if the producer cannot be disposed.
      */
@@ -39,7 +40,8 @@ public void instantiate() throws IOException {
     }
 
     /**
-     * Code snippet demonstrating how to create an EventHubProducer that routes events to a single partition.
+     * Code snippet demonstrating how to create an {@link EventHubAsyncProducer}  that routes events to a single
+     * partition.
      *
      * @throws IOException if the producer cannot be disposed.
      */
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientJavaDocCodeSamples.java
new file mode 100644
index 000000000000..c4f947fd78c4
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientJavaDocCodeSamples.java
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+/**
+ * Contains code snippets when generating javadocs through doclets for {@link EventHubClient}.
+ */
+public class EventHubClientJavaDocCodeSamples {
+    /**
+     * Creating an {@link EventHubClient} using a connection string specific to an Event Hub instance with different
+     * retry options.
+     */
+    public void instantiation() {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubclient.instantiation
+        String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
+            + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
+
+        EventHubClient client = new EventHubClientBuilder()
+            .connectionString(connectionString)
+            .buildClient();
+        // END: com.azure.messaging.eventhubs.eventhubclient.instantiation
+
+        client.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
new file mode 100644
index 000000000000..a525234d4bad
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
@@ -0,0 +1,111 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.RetryOptions;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * Contains code snippets when generating javadocs through doclets for {@link EventHubProducer}.
+ */
+public class EventHubProducerJavaDocCodeSamples {
+    private final EventHubClient client = new EventHubClientBuilder()
+        .connectionString("fake-string")
+        .buildClient();
+
+    /**
+     * Code snippet demonstrating how to create an {@link EventHubProducer} that automatically routes events to any
+     * partition.
+     *
+     * @throws IOException if the producer cannot be disposed.
+     */
+    public void instantiate() throws IOException {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.instantiation
+        EventHubClient client = new EventHubClientBuilder()
+            .connectionString("event-hubs-namespace-connection-string", "event-hub-name")
+            .buildClient();
+
+        EventHubProducer producer = client.createProducer();
+        // END: com.azure.messaging.eventhubs.eventhubproducer.instantiation
+
+        producer.close();
+    }
+
+    /**
+     * Code snippet demonstrating how to create an {@link EventHubProducer} that routes events to a single partition.
+     *
+     * @throws IOException if the producer cannot be disposed.
+     */
+    public void instantiatePartitionProducer() throws IOException {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.instantiation#partitionId
+        RetryOptions retryOptions = new RetryOptions()
+            .tryTimeout(Duration.ofSeconds(45));
+        EventHubProducerOptions options = new EventHubProducerOptions()
+            .partitionId("foo")
+            .retry(retryOptions);
+
+        EventHubProducer producer = client.createProducer(options);
+        // END: com.azure.messaging.eventhubs.eventhubproducer.instantiation#partitionId
+
+        producer.close();
+    }
+
+    /**
+     * Code snippet demonstrating how to send events with a partition key.
+     */
+    public void sendEventsSendOptions() {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.send#publisher-sendOptions
+        final List<EventData> events = Arrays.asList(
+            new EventData("sourdough".getBytes(UTF_8)),
+            new EventData("rye".getBytes(UTF_8)),
+            new EventData("wheat".getBytes(UTF_8))
+        );
+
+        final EventHubProducer producer = client.createProducer();
+        final SendOptions options = new SendOptions()
+            .partitionKey("bread");
+
+        producer.send(events, options);
+        // END: com.azure.messaging.eventhubs.eventhubproducer.send#publisher-sendOptions
+    }
+
+    /**
+     * Code snippet demonstrating how to create an {@link EventDataBatch} and send it.
+     */
+    public void sendEventDataBatch() {
+        final EventHubProducer producer = client.createProducer();
+
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.send#eventDataBatch
+        final List<EventData> telemetryEvents = Arrays.asList(
+            new EventData("92".getBytes(UTF_8)).addProperty("telemetry", "latency"),
+            new EventData("98".getBytes(UTF_8)).addProperty("telemetry", "cpu-temperature"),
+            new EventData("120".getBytes(UTF_8)).addProperty("telemetry", "fps")
+        );
+
+        final BatchOptions options = new BatchOptions()
+            .partitionKey("telemetry")
+            .maximumSizeInBytes(256);
+
+        EventDataBatch currentBatch = producer.createBatch(options);
+
+        // For each telemetry event, we try to add it to the current batch.
+        // When the batch is full, send it then create another batch to add more events to.
+        for (EventData event : telemetryEvents) {
+            if (!currentBatch.tryAdd(event)) {
+                producer.send(currentBatch);
+                currentBatch = producer.createBatch(options);
+            }
+        }
+        // END: com.azure.messaging.eventhubs.eventhubproducer.send#eventDataBatch
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncClientIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncClientIntegrationTest.java
new file mode 100644
index 000000000000..c6f2c028eeea
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncClientIntegrationTest.java
@@ -0,0 +1,204 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.TransportType;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.messaging.eventhubs.implementation.ApiTestBase;
+import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
+import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import reactor.core.Disposable;
+import reactor.core.Disposables;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.azure.messaging.eventhubs.EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME;
+import static com.azure.messaging.eventhubs.TestUtils.isMatchingEvent;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * Tests scenarios on {@link EventHubAsyncClient}.
+ */
+@RunWith(Parameterized.class)
+public class EventHubAsyncClientIntegrationTest extends ApiTestBase {
+    private static final int NUMBER_OF_EVENTS = 5;
+
+    @Parameterized.Parameters(name = "{index}: transportType={0}")
+    public static Iterable<Object> getTransportTypes() {
+        return Arrays.asList(TransportType.AMQP, TransportType.AMQP_WEB_SOCKETS);
+    }
+
+    private static final String PARTITION_ID = "1";
+    private static final AtomicBoolean HAS_PUSHED_EVENTS = new AtomicBoolean();
+    private static final AtomicReference<Instant> MESSAGES_PUSHED_INSTANT = new AtomicReference<>();
+    private static final String MESSAGE_TRACKING_VALUE = UUID.randomUUID().toString();
+
+    private EventHubAsyncClient client;
+
+    @Rule
+    public TestName testName = new TestName();
+
+    public EventHubAsyncClientIntegrationTest(TransportType transportType) {
+        super(new ClientLogger(EventHubAsyncClientIntegrationTest.class));
+
+        setTransportType(transportType);
+    }
+
+    @Override
+    protected String testName() {
+        return testName.getMethodName();
+    }
+
+    @Override
+    protected void beforeTest() {
+        skipIfNotRecordMode();
+
+        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
+        final ConnectionOptions connectionOptions = getConnectionOptions();
+
+        client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
+
+        setupEventTestData(client);
+    }
+
+    @Override
+    protected void afterTest() {
+        dispose(client);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void nullConstructor() throws NullPointerException {
+        new EventHubAsyncClient(null, null, null);
+    }
+
+    /**
+     * Verifies that we can receive messages, and that the receiver continues to fetch messages when the prefetch queue
+     * is exhausted.
+     */
+    @Test
+    public void receiveMessage() {
+        // Arrange
+        final EventHubConsumerOptions options = new EventHubConsumerOptions()
+            .prefetchCount(2);
+        final EventHubAsyncConsumer consumer = client.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
+            EventPosition.fromEnqueuedTime(MESSAGES_PUSHED_INSTANT.get()), options);
+
+        // Act & Assert
+        StepVerifier.create(consumer.receive().filter(x -> isMatchingEvent(x, MESSAGE_TRACKING_VALUE)).take(NUMBER_OF_EVENTS))
+            .expectNextCount(NUMBER_OF_EVENTS)
+            .verifyComplete();
+    }
+
+    /**
+     * Verifies that we can have multiple consumers listening to the same partition + consumer group at the same time.
+     */
+    @Ignore("Investigate. Only 2 of the 4 consumers get the events. The other two consumers do not.")
+    @Test
+    public void parallelEventHubClients() throws InterruptedException {
+        skipIfNotRecordMode();
+
+        // Arrange
+        final int numberOfClients = 4;
+        final int numberOfEvents = 10;
+        final String messageTrackingId = "message-tracking-id";
+        final String messageTrackingValue = UUID.randomUUID().toString();
+        final Flux<EventData> events = Flux.range(0, numberOfEvents).map(number -> {
+            final EventData eventData = new EventData("testString".getBytes(UTF_8));
+            eventData.addProperty(messageTrackingId, messageTrackingValue);
+            return eventData;
+        });
+
+        final CountDownLatch countDownLatch = new CountDownLatch(numberOfClients);
+        final EventHubAsyncClient[] clients = new EventHubAsyncClient[numberOfClients];
+        for (int i = 0; i < numberOfClients; i++) {
+            clients[i] = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), new ReactorHandlerProvider(getReactorProvider()));
+        }
+
+        final EventHubAsyncProducer producer = clients[0].createProducer(new EventHubProducerOptions().partitionId(PARTITION_ID));
+        final List<EventHubAsyncConsumer> consumers = new ArrayList<>();
+        final Disposable.Composite subscriptions = Disposables.composite();
+
+        try {
+            for (final EventHubAsyncClient hubClient : clients) {
+                final EventHubAsyncConsumer consumer = hubClient.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
+                consumers.add(consumer);
+
+                final Disposable subscription = consumer.receive().filter(event -> {
+                    return event.properties() != null
+                        && event.properties().containsKey(messageTrackingId)
+                        && messageTrackingValue.equals(event.properties().get(messageTrackingId));
+                }).take(numberOfEvents).subscribe(event -> {
+                    logger.info("Event[{}] matched.", event.sequenceNumber());
+                }, error -> Assert.fail("An error should not have occurred:" + error.toString()), () -> {
+                        long count = countDownLatch.getCount();
+                        logger.info("Finished consuming events. Counting down: {}", count);
+                        countDownLatch.countDown();
+                    });
+
+                subscriptions.add(subscription);
+            }
+
+            // Act
+            producer.send(events).block(TIMEOUT);
+
+            // Assert
+            // Wait for all the events we sent to be received by each of the consumers.
+            countDownLatch.await(TIMEOUT.getSeconds(), TimeUnit.SECONDS);
+            Assert.assertEquals(0, countDownLatch.getCount());
+
+            logger.info("Completed successfully.");
+        } finally {
+            logger.info("Disposing of subscriptions, consumers and clients.");
+            subscriptions.dispose();
+
+            dispose(producer);
+            dispose(consumers.toArray(new EventHubAsyncConsumer[0]));
+            dispose(clients);
+        }
+    }
+
+    /**
+     * When we run this test, we check if there have been events already pushed to the partition, if not, we push some
+     * events there.
+     */
+    private void setupEventTestData(EventHubAsyncClient client) {
+        if (HAS_PUSHED_EVENTS.getAndSet(true)) {
+            logger.info("Already pushed events to partition. Skipping.");
+            return;
+        }
+
+        logger.info("Pushing events to partition. Message tracking value: {}", MESSAGE_TRACKING_VALUE);
+
+        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
+        final EventHubAsyncProducer producer = client.createProducer(producerOptions);
+        final Flux<EventData> events = TestUtils.getEvents(NUMBER_OF_EVENTS, MESSAGE_TRACKING_VALUE);
+
+        try {
+            MESSAGES_PUSHED_INSTANT.set(Instant.now());
+            producer.send(events).block(TIMEOUT);
+        } finally {
+            dispose(producer);
+        }
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java
index 11b676fdffa5..1741a14c08c7 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java
@@ -3,15 +3,10 @@
 
 package com.azure.messaging.eventhubs;
 
-import com.azure.core.amqp.TransportType;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
-import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
-import com.azure.messaging.eventhubs.implementation.ConnectionStringProperties;
-import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
 import com.azure.messaging.eventhubs.models.BatchOptions;
 import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
-import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,13 +40,13 @@ protected String testName() {
 
     @Override
     protected void beforeTest() {
-        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        final ConnectionStringProperties properties = new ConnectionStringProperties(getConnectionString());
-        final ConnectionOptions connectionOptions = new ConnectionOptions(properties.endpoint().getHost(),
-            properties.eventHubName(), getTokenCredential(), getAuthorizationType(), TransportType.AMQP, RETRY_OPTIONS,
-            ProxyConfiguration.SYSTEM_DEFAULTS, Schedulers.parallel());
+        skipIfNotRecordMode();
 
-        client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
+        client = new EventHubClientBuilder()
+            .connectionString(getConnectionString())
+            .retry(RETRY_OPTIONS)
+            .scheduler(Schedulers.parallel())
+            .buildAsyncClient();
     }
 
     @Override
@@ -64,8 +59,6 @@ protected void afterTest() {
      */
     @Test
     public void sendMessageToPartition() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
         final List<EventData> events = Arrays.asList(
@@ -86,8 +79,6 @@ public void sendMessageToPartition() throws IOException {
      */
     @Test
     public void sendMessage() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final List<EventData> events = Arrays.asList(
             new EventData("Event 1".getBytes(UTF_8)),
@@ -106,8 +97,6 @@ public void sendMessage() throws IOException {
      */
     @Test
     public void sendBatch() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final List<EventData> events = Arrays.asList(
             new EventData("Event 1".getBytes(UTF_8)),
@@ -134,8 +123,6 @@ public void sendBatch() throws IOException {
      */
     @Test
     public void sendBatchWithPartitionKey() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final List<EventData> events = Arrays.asList(
             new EventData("Event 1".getBytes(UTF_8)),
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java
index eaf3bc89e17a..76892d08ac55 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java
@@ -68,7 +68,7 @@ public void teardown() {
     public void sendMultipleMessages() {
         // Arrange
         final int count = 4;
-        final byte[] contents = CONTENTS.getBytes(UTF_8);
+        final byte[] contents = TEST_CONTENTS.getBytes(UTF_8);
         final Flux<EventData> testData = Flux.range(0, count).flatMap(number -> {
             final EventData data = new EventData(contents);
             return Flux.just(data);
@@ -100,7 +100,7 @@ public void sendMultipleMessages() {
     @Test
     public void sendSingleMessage() {
         // Arrange
-        final EventData testData = new EventData(CONTENTS.getBytes(UTF_8));
+        final EventData testData = new EventData(TEST_CONTENTS.getBytes(UTF_8));
 
         when(sendLink.send(any(Message.class))).thenReturn(Mono.empty());
 
@@ -128,8 +128,8 @@ public void sendSingleMessage() {
     public void partitionProducerCannotSendWithPartitionKey() {
         // Arrange
         final Flux<EventData> testData = Flux.just(
-            new EventData(CONTENTS.getBytes(UTF_8)),
-            new EventData(CONTENTS.getBytes(UTF_8)));
+            new EventData(TEST_CONTENTS.getBytes(UTF_8)),
+            new EventData(TEST_CONTENTS.getBytes(UTF_8)));
 
         when(sendLink.send(anyList())).thenReturn(Mono.empty());
 
@@ -163,7 +163,7 @@ public void sendTooManyMessages() {
 
         // We believe 20 events is enough for that EventDataBatch to be greater than max size.
         final Flux<EventData> testData = Flux.range(0, 20).flatMap(number -> {
-            final EventData data = new EventData(CONTENTS.getBytes(UTF_8));
+            final EventData data = new EventData(TEST_CONTENTS.getBytes(UTF_8));
             return Flux.just(data);
         });
 
@@ -378,7 +378,7 @@ public void sendsAnEventDataBatch() {
         verify(link, times(2)).getLinkSize();
     }
 
-    private static final String CONTENTS = "SSLorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vehicula posuere lobortis. Aliquam finibus volutpat dolor, faucibus pellentesque ipsum bibendum vitae. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut sit amet urna hendrerit, dapibus justo a, sodales justo. Mauris finibus augue id pulvinar congue. Nam maximus luctus ipsum, at commodo ligula euismod ac. Phasellus vitae lacus sit amet diam porta placerat. \n"
+    static final String TEST_CONTENTS = "SSLorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vehicula posuere lobortis. Aliquam finibus volutpat dolor, faucibus pellentesque ipsum bibendum vitae. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut sit amet urna hendrerit, dapibus justo a, sodales justo. Mauris finibus augue id pulvinar congue. Nam maximus luctus ipsum, at commodo ligula euismod ac. Phasellus vitae lacus sit amet diam porta placerat. \n"
         + "Ut sodales efficitur sapien ut posuere. Morbi sed tellus est. Proin eu erat purus. Proin massa nunc, condimentum id iaculis dignissim, consectetur et odio. Cras suscipit sem eu libero aliquam tincidunt. Nullam ut arcu suscipit, eleifend velit in, cursus libero. Ut eleifend facilisis odio sit amet feugiat. Phasellus at nunc sit amet elit sagittis commodo ac in nisi. Fusce vitae aliquam quam. Integer vel nibh euismod, tempus elit vitae, pharetra est. Duis vulputate enim a elementum dignissim. Morbi dictum enim id elit scelerisque, in elementum nulla pharetra. \n"
         + "Aenean aliquet aliquet condimentum. Proin dapibus dui id libero tempus feugiat. Sed commodo ligula a lectus mattis, vitae tincidunt velit auctor. Fusce quis semper dui. Phasellus eu efficitur sem. Ut non sem sit amet enim condimentum venenatis id dictum massa. Nullam sagittis lacus a neque sodales, et ultrices arcu mattis. Aliquam erat volutpat. \n"
         + "Aenean fringilla quam elit, id mattis purus vestibulum nec. Praesent porta eros in dapibus molestie. Vestibulum orci libero, tincidunt et turpis eget, condimentum lobortis enim. Fusce suscipit ante et mauris consequat cursus nec laoreet lorem. Maecenas in sollicitudin diam, non tincidunt purus. Nunc mauris purus, laoreet eget interdum vitae, placerat a sapien. In mi risus, blandit eu facilisis nec, molestie suscipit leo. Pellentesque molestie urna vitae dui faucibus bibendum. \n"
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
index 83eb91c70326..db8edc51cc50 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
@@ -3,66 +3,27 @@
 
 package com.azure.messaging.eventhubs;
 
-import com.azure.core.amqp.TransportType;
+import com.azure.core.http.rest.IterableResponse;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
-import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
-import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
-import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
-import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
-import com.azure.messaging.eventhubs.models.EventPosition;
+import com.azure.messaging.eventhubs.implementation.ConnectionStringProperties;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import reactor.core.Disposable;
-import reactor.core.Disposables;
-import reactor.core.publisher.Flux;
-import reactor.test.StepVerifier;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static com.azure.messaging.eventhubs.EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME;
-import static com.azure.messaging.eventhubs.TestUtils.isMatchingEvent;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- * Tests scenarios on {@link EventHubAsyncClient}.
- */
-@RunWith(Parameterized.class)
-public class EventHubClientIntegrationTest extends ApiTestBase {
-    private static final int NUMBER_OF_EVENTS = 5;
-
-    @Parameterized.Parameters(name = "{index}: transportType={0}")
-    public static Iterable<Object> getTransportTypes() {
-        return Arrays.asList(TransportType.AMQP, TransportType.AMQP_WEB_SOCKETS);
-    }
+import java.util.stream.Collectors;
 
-    private static final String PARTITION_ID = "1";
-    private static final AtomicBoolean HAS_PUSHED_EVENTS = new AtomicBoolean();
-    private static final AtomicReference<Instant> MESSAGES_PUSHED_INSTANT = new AtomicReference<>();
-    private static final String MESSAGE_TRACKING_VALUE = UUID.randomUUID().toString();
-
-    private EventHubAsyncClient client;
+public class EventHubClientIntegrationTest extends ApiTestBase {
+    private EventHubClient client;
 
     @Rule
     public TestName testName = new TestName();
 
-    public EventHubClientIntegrationTest(TransportType transportType) {
+    public EventHubClientIntegrationTest() {
         super(new ClientLogger(EventHubClientIntegrationTest.class));
-
-        setTransportType(transportType);
     }
 
     @Override
@@ -74,12 +35,10 @@ protected String testName() {
     protected void beforeTest() {
         skipIfNotRecordMode();
 
-        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        final ConnectionOptions connectionOptions = getConnectionOptions();
-
-        client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
-
-        setupEventTestData(client);
+        client = new EventHubClientBuilder()
+            .connectionString(getConnectionString())
+            .retry(RETRY_OPTIONS)
+            .buildClient();
     }
 
     @Override
@@ -87,118 +46,58 @@ protected void afterTest() {
         dispose(client);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullConstructor() throws NullPointerException {
-        new EventHubAsyncClient(null, null, null);
-    }
-
     /**
-     * Verifies that we can receive messages, and that the receiver continues to fetch messages when the prefetch queue
-     * is exhausted.
+     * Verifies we can get partition ids of an Event Hub.
      */
     @Test
-    public void receiveMessage() {
-        // Arrange
-        final EventHubConsumerOptions options = new EventHubConsumerOptions()
-            .prefetchCount(2);
-        final EventHubAsyncConsumer consumer = client.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
-            EventPosition.fromEnqueuedTime(MESSAGES_PUSHED_INSTANT.get()), options);
-
-        // Act & Assert
-        StepVerifier.create(consumer.receive().filter(x -> isMatchingEvent(x, MESSAGE_TRACKING_VALUE)).take(NUMBER_OF_EVENTS))
-            .expectNextCount(NUMBER_OF_EVENTS)
-            .verifyComplete();
+    public void getPartitionIds() {
+        // Act
+        final IterableResponse<String> response = client.getPartitionIds();
+
+        // Assert
+        Assert.assertNotNull(response);
+
+        final List<String> partitionIds = response.stream().collect(Collectors.toList());
+        Assert.assertTrue(partitionIds.size() > 1);
     }
 
     /**
-     * Verifies that we can have multiple consumers listening to the same partition + consumer group at the same time.
+     * Verifies we can get partition ids of an Event Hub.
      */
-    @Ignore("Investigate. Only 2 of the 4 consumers get the events. The other two consumers do not.")
     @Test
-    public void parallelEventHubClients() throws InterruptedException {
-        skipIfNotRecordMode();
-
+    public void getMetadata() {
         // Arrange
-        final int numberOfClients = 4;
-        final int numberOfEvents = 10;
-        final String messageTrackingId = "message-tracking-id";
-        final String messageTrackingValue = UUID.randomUUID().toString();
-        final Flux<EventData> events = Flux.range(0, numberOfEvents).map(number -> {
-            final EventData eventData = new EventData("testString".getBytes(UTF_8));
-            eventData.addProperty(messageTrackingId, messageTrackingValue);
-            return eventData;
-        });
-
-        final CountDownLatch countDownLatch = new CountDownLatch(numberOfClients);
-        final EventHubAsyncClient[] clients = new EventHubAsyncClient[numberOfClients];
-        for (int i = 0; i < numberOfClients; i++) {
-            clients[i] = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), new ReactorHandlerProvider(getReactorProvider()));
-        }
-
-        final EventHubAsyncProducer producer = clients[0].createProducer(new EventHubProducerOptions().partitionId(PARTITION_ID));
-        final List<EventHubAsyncConsumer> consumers = new ArrayList<>();
-        final Disposable.Composite subscriptions = Disposables.composite();
-
-        try {
-            for (final EventHubAsyncClient hubClient : clients) {
-                final EventHubAsyncConsumer consumer = hubClient.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
-                consumers.add(consumer);
-
-                final Disposable subscription = consumer.receive().filter(event -> {
-                    return event.properties() != null
-                        && event.properties().containsKey(messageTrackingId)
-                        && messageTrackingValue.equals(event.properties().get(messageTrackingId));
-                }).take(numberOfEvents).subscribe(event -> {
-                    logger.info("Event[{}] matched.", event.sequenceNumber());
-                }, error -> Assert.fail("An error should not have occurred:" + error.toString()), () -> {
-                        long count = countDownLatch.getCount();
-                        logger.info("Finished consuming events. Counting down: {}", count);
-                        countDownLatch.countDown();
-                    });
-
-                subscriptions.add(subscription);
-            }
-
-            // Act
-            producer.send(events).block(TIMEOUT);
-
-            // Assert
-            // Wait for all the events we sent to be received by each of the consumers.
-            countDownLatch.await(TIMEOUT.getSeconds(), TimeUnit.SECONDS);
-            Assert.assertEquals(0, countDownLatch.getCount());
-
-            logger.info("Completed successfully.");
-        } finally {
-            logger.info("Disposing of subscriptions, consumers and clients.");
-            subscriptions.dispose();
-
-            dispose(producer);
-            dispose(consumers.toArray(new EventHubAsyncConsumer[0]));
-            dispose(clients);
-        }
+        final ConnectionStringProperties connectionProperties = getConnectionStringProperties();
+
+        // Act
+        final EventHubProperties properties = client.getProperties();
+
+        // Assert
+        Assert.assertNotNull(properties);
+        Assert.assertEquals(connectionProperties.eventHubName(), properties.name());
+        Assert.assertTrue(properties.createdAt().isBefore(Instant.now()));
+
+        Assert.assertNotNull(properties.partitionIds());
+        Assert.assertTrue(properties.partitionIds().length > 1);
     }
 
     /**
-     * When we run this test, we check if there have been events already pushed to the partition, if not, we push some
-     * events there.
+     * Verifies we can get partition ids of an Event Hub.
      */
-    private void setupEventTestData(EventHubAsyncClient client) {
-        if (HAS_PUSHED_EVENTS.getAndSet(true)) {
-            logger.info("Already pushed events to partition. Skipping.");
-            return;
-        }
-
-        logger.info("Pushing events to partition. Message tracking value: {}", MESSAGE_TRACKING_VALUE);
-
-        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
-        final EventHubAsyncProducer producer = client.createProducer(producerOptions);
-        final Flux<EventData> events = TestUtils.getEvents(NUMBER_OF_EVENTS, MESSAGE_TRACKING_VALUE);
-
-        try {
-            MESSAGES_PUSHED_INSTANT.set(Instant.now());
-            producer.send(events).block(TIMEOUT);
-        } finally {
-            dispose(producer);
-        }
+    @Test
+    public void getPartitionProperties() {
+        // Arrange
+        final ConnectionStringProperties connectionProperties = getConnectionStringProperties();
+        final EventHubProperties properties = client.getProperties();
+        final String partitionId = properties.partitionIds()[0];
+
+        // Act
+        final PartitionProperties partitionProperties = client.getPartitionProperties(partitionId);
+
+        // Assert
+        Assert.assertNotNull(partitionProperties);
+
+        Assert.assertEquals(connectionProperties.eventHubName(), partitionProperties.eventHubName());
+        Assert.assertEquals(partitionId, partitionProperties.id());
     }
 }
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerIntegrationTest.java
new file mode 100644
index 000000000000..524d7981611e
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerIntegrationTest.java
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.messaging.eventhubs.implementation.ApiTestBase;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import reactor.core.scheduler.Schedulers;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+public class EventHubProducerIntegrationTest extends ApiTestBase {
+    private static final String PARTITION_ID = "1";
+    private EventHubClient client;
+
+    public EventHubProducerIntegrationTest() {
+        super(new ClientLogger(EventHubProducerIntegrationTest.class));
+    }
+
+    @Rule
+    public TestName testName = new TestName();
+
+    @Override
+    protected String testName() {
+        return testName.getMethodName();
+    }
+
+    @Override
+    protected void beforeTest() {
+        skipIfNotRecordMode();
+
+        client = new EventHubClientBuilder()
+            .connectionString(getConnectionString())
+            .retry(RETRY_OPTIONS)
+            .scheduler(Schedulers.parallel())
+            .buildClient();
+    }
+
+    @Override
+    protected void afterTest() {
+        dispose(client);
+    }
+
+    /**
+     * Verifies that we can create and send a message to an Event Hub partition.
+     */
+    @Test
+    public void sendMessageToPartition() throws IOException {
+        // Arrange
+        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer(producerOptions)) {
+            producer.send(events);
+        }
+    }
+
+    /**
+     * Verifies that we can create an {@link EventHubProducer} that does not care about partitions and lets the service
+     * distribute the events.
+     */
+    @Test
+    public void sendMessage() throws IOException {
+        // Arrange
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer()) {
+            producer.send(events);
+        }
+    }
+
+    /**
+     * Verifies we can create an {@link EventDataBatch} and send it using our EventHubProducer.
+     */
+    @Test
+    public void sendBatch() throws IOException {
+        // Arrange
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer()) {
+            EventDataBatch batch = producer.createBatch();
+            events.forEach(event -> {
+                Assert.assertTrue(batch.tryAdd(event));
+            });
+
+            producer.send(batch);
+        }
+    }
+
+    /**
+     * Verifies we can create an {@link EventDataBatch} with a partition key and send it using our EventHubProducer.
+     */
+    @Test
+    public void sendBatchWithPartitionKey() throws IOException {
+        // Arrange
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer()) {
+            final BatchOptions options = new BatchOptions().partitionKey("my-partition-key");
+            final EventDataBatch batch = producer.createBatch(options);
+
+            events.forEach(event -> {
+                Assert.assertTrue(batch.tryAdd(event));
+            });
+
+            producer.send(batch);
+        }
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java
new file mode 100644
index 000000000000..db2fae439f3b
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java
@@ -0,0 +1,215 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.RetryOptions;
+import com.azure.core.amqp.exception.AmqpException;
+import com.azure.core.amqp.exception.ErrorCondition;
+import com.azure.core.amqp.exception.ErrorContext;
+import com.azure.messaging.eventhubs.implementation.AmqpSendLink;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
+import org.apache.qpid.proton.amqp.messaging.Section;
+import org.apache.qpid.proton.message.Message;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.util.List;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests to verify functionality of {@link EventHubProducer}.
+ */
+public class EventHubProducerTest {
+    @Mock
+    private AmqpSendLink sendLink;
+    @Captor
+    private ArgumentCaptor<Message> singleMessageCaptor;
+    @Captor
+    private ArgumentCaptor<List<Message>> messagesCaptor;
+
+    private EventHubAsyncProducer asyncProducer;
+    private RetryOptions retryOptions = new RetryOptions().tryTimeout(Duration.ofSeconds(30));
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(sendLink.getLinkSize()).thenReturn(Mono.just(EventHubAsyncProducer.MAX_MESSAGE_LENGTH_BYTES));
+        when(sendLink.getErrorContext()).thenReturn(new ErrorContext("test-namespace"));
+        when(sendLink.send(anyList())).thenReturn(Mono.empty());
+        when(sendLink.send(any(Message.class))).thenReturn(Mono.empty());
+
+        asyncProducer = new EventHubAsyncProducer(
+            Mono.fromCallable(() -> sendLink),
+            new EventHubProducerOptions().retry(retryOptions));
+    }
+
+    @After
+    public void teardown() {
+        Mockito.framework().clearInlineMocks();
+        sendLink = null;
+        singleMessageCaptor = null;
+        messagesCaptor = null;
+    }
+
+    /**
+     * Verifies can send a single message.
+     */
+    @Test
+    public void sendSingleMessage() {
+        // Arrange
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+        final EventData eventData = new EventData("hello-world".getBytes(UTF_8));
+
+        // Act
+        producer.send(eventData);
+
+        // Assert
+        verify(sendLink, times(1)).send(any(Message.class));
+        verify(sendLink).send(singleMessageCaptor.capture());
+
+        final Message message = singleMessageCaptor.getValue();
+        Assert.assertEquals(Section.SectionType.Data, message.getBody().getType());
+    }
+
+    /**
+     * Verifies we can send multiple messages.
+     */
+    @Test
+    public void sendMultipleMessages() {
+        // Arrange
+        final int count = 4;
+        final Iterable<EventData> events = Flux.range(0, count).map(number -> {
+            final String contents = "event-data-" + number;
+            return new EventData(contents.getBytes(UTF_8));
+        }).toIterable();
+
+        final SendOptions options = new SendOptions();
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+
+        // Act
+        producer.send(events, options);
+
+        // Assert
+        verify(sendLink).send(messagesCaptor.capture());
+
+        final List<Message> messagesSent = messagesCaptor.getValue();
+        Assert.assertEquals(count, messagesSent.size());
+
+        messagesSent.forEach(message -> Assert.assertEquals(Section.SectionType.Data, message.getBody().getType()));
+    }
+
+    /**
+     * Verifies that the producer can create an {@link EventDataBatch} with the size given by the underlying AMQP send
+     * link.
+     */
+    @Test
+    public void createsEventDataBatch() {
+        // Arrange
+        int maxLinkSize = 1024;
+
+        // Overhead when serializing an event, to figure out what the maximum size we can use for an event payload.
+        int eventOverhead = 24;
+        int maxEventPayload = maxLinkSize - eventOverhead;
+
+        final AmqpSendLink link = mock(AmqpSendLink.class);
+        when(link.getLinkSize()).thenReturn(Mono.just(maxLinkSize));
+
+        // This event is 1024 bytes when serialized.
+        final EventData event = new EventData(new byte[maxEventPayload]);
+
+        // This event will be 1025 bytes when serialized.
+        final EventData tooLargeEvent = new EventData(new byte[maxEventPayload + 1]);
+
+        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().retry(retryOptions);
+        final EventHubAsyncProducer hubAsyncProducer = new EventHubAsyncProducer(Mono.fromCallable(() -> link), producerOptions);
+        final EventHubProducer hubProducer = new EventHubProducer(hubAsyncProducer, retryOptions.tryTimeout());
+
+        // Act
+        final EventDataBatch batch = hubProducer.createBatch();
+
+        // Assert
+        Assert.assertNull(batch.getPartitionKey());
+        Assert.assertFalse(batch.tryAdd(tooLargeEvent));
+        Assert.assertTrue(batch.tryAdd(event));
+
+        verify(link, times(1)).getLinkSize();
+    }
+
+    /**
+     * Verifies we can create an EventDataBatch with partition key and link size.
+     */
+    @Test
+    public void createsEventDataBatchWithPartitionKey() {
+        // Arrange
+        int maxBatchSize = 1024;
+
+        // Overhead when serializing an event, to figure out what the maximum size we can use for an event payload.
+        int eventOverhead = 98;
+        int maxEventPayload = maxBatchSize - eventOverhead;
+
+        // This event is 1024 bytes when serialized.
+        final EventData event = new EventData(new byte[maxEventPayload]);
+
+        // No idea what the overhead for adding partition key is. But we know this will be smaller than the max size.
+        final BatchOptions options = new BatchOptions()
+            .partitionKey("some-key")
+            .maximumSizeInBytes(maxBatchSize);
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+
+        // Act
+        final EventDataBatch batch = producer.createBatch(options);
+
+        // Arrange
+        Assert.assertEquals(options.partitionKey(), batch.getPartitionKey());
+        Assert.assertTrue(batch.tryAdd(event));
+    }
+
+    /**
+     * Verifies we can create an EventDataBatch with partition key and link size.
+     */
+    @Test
+    public void payloadTooLarge() {
+        // Arrange
+        int maxBatchSize = 1024;
+
+        // Overhead when serializing an event, to figure out what the maximum size we can use for an event payload.
+        int eventOverhead = 24;
+        int maxEventPayload = maxBatchSize - eventOverhead;
+
+        // This event is 1025 bytes when serialized.
+        final EventData event = new EventData(new byte[maxEventPayload + 1]);
+
+        // No idea what the overhead for adding partition key is. But we know this will be smaller than the max size.
+        final BatchOptions options = new BatchOptions()
+            .maximumSizeInBytes(maxBatchSize);
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+        final EventDataBatch batch = producer.createBatch(options);
+
+        // Act & Assert
+        try {
+            batch.tryAdd(event);
+        } catch (AmqpException e) {
+            Assert.assertEquals(ErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED, e.getErrorCondition());
+        }
+    }
+}
diff --git a/sdk/eventhubs/ci.data.yml b/sdk/eventhubs/ci.data.yml
new file mode 100644
index 000000000000..7ca44a5f51c8
--- /dev/null
+++ b/sdk/eventhubs/ci.data.yml
@@ -0,0 +1,46 @@
+# DO NOT EDIT THIS FILE
+# This file is generated automatically and any changes will be lost.
+
+resources:
+  repositories:
+    - repository: azure-sdk-build-tools
+      type: git
+      name: internal/azure-sdk-build-tools
+
+trigger:
+  branches:
+    include:
+      - master
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/eventhubs/
+    exclude:
+      - sdk/eventhubs/azure
+
+pr:
+  branches:
+    include:
+      - master
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/eventhubs/
+    exclude:
+      - sdk/eventhubs/azure
+
+stages:
+  - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+    parameters:
+      ServiceDirectory: eventhubs
+      Artifacts:
+        - name: azure-eventhubs
+          safeName: azureeventhubs
+        - name: azure-eventhubs-eph
+          safeName: azureeventhubseph
+        - name: azure-eventhubs-extensions
+          safeName: azureeventhubsextensions
diff --git a/sdk/eventhubs/ci.yml b/sdk/eventhubs/ci.yml
index 9ecb29dd5ea3..4b074d49cf9b 100644
--- a/sdk/eventhubs/ci.yml
+++ b/sdk/eventhubs/ci.yml
@@ -17,6 +17,8 @@ trigger:
   paths:
     include:
       - sdk/eventhubs/
+    exclude:
+      - sdk/eventhubs/microsoft-azure
 
 pr:
   branches:
@@ -28,6 +30,8 @@ pr:
   paths:
     include:
       - sdk/eventhubs/
+    exclude:
+      - sdk/eventhubs/microsoft-azure
 
 stages:
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
diff --git a/sdk/eventhubs/pom.service.xml b/sdk/eventhubs/pom.service.xml
index f99125abb872..9c863056e145 100644
--- a/sdk/eventhubs/pom.service.xml
+++ b/sdk/eventhubs/pom.service.xml
@@ -1,20 +1,41 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azure</groupId>
   <artifactId>azure-eventhubs-service</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <modules>
-    <module>microsoft-azure-eventhubs</module>
-    <module>microsoft-azure-eventhubs-eph</module>
-    <module>microsoft-azure-eventhubs-extensions</module>
-    <module>../core/azure-core</module>
-    <module>../core/azure-core-test</module>
-    <module>../core/azure-core-amqp</module>
-    <module>azure-messaging-eventhubs</module>
-  </modules>
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <profiles>
+    <profile>
+      <id>data</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>microsoft-azure-eventhubs</module>
+        <module>microsoft-azure-eventhubs-eph</module>
+        <module>microsoft-azure-eventhubs-extensions</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>client</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>!data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>../core/azure-core</module>
+        <module>../core/azure-core-test</module>
+        <module>../core/azure-core-amqp</module>
+        <module>azure-messaging-eventhubs</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>
diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
index e2be2e9b861f..eb7e8bb04de5 100644
--- a/sdk/identity/azure-identity/pom.xml
+++ b/sdk/identity/azure-identity/pom.xml
@@ -8,6 +8,10 @@
   <artifactId>azure-identity</artifactId>
   <version>1.0.0-preview.3</version>
 
+  <name>Microsoft Azure client library for Identity</name>
+  <description>This module contains client library for Microsoft Azure Identity.</description>
+  <url>https://github.com/Azure/azure-sdk-for-java</url>
+
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
diff --git a/sdk/keyvault/azure-keyvault-keys/pom.xml b/sdk/keyvault/azure-keyvault-keys/pom.xml
index c1819383b7dc..7cf076074879 100644
--- a/sdk/keyvault/azure-keyvault-keys/pom.xml
+++ b/sdk/keyvault/azure-keyvault-keys/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-keyvault-keys</artifactId>
   <version>4.0.0-preview.3</version>
 
-  <name>azure-keyvault-keys</name>
+  <name>Microsoft Azure client library for KeyVault Keys</name>
+  <description>This module contains client library for Microsoft Azure KeyVault Keys.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/keyvault/azure-keyvault-secrets/pom.xml b/sdk/keyvault/azure-keyvault-secrets/pom.xml
index 0c3cf6d4f518..3e9d333cd1b8 100644
--- a/sdk/keyvault/azure-keyvault-secrets/pom.xml
+++ b/sdk/keyvault/azure-keyvault-secrets/pom.xml
@@ -13,7 +13,8 @@
   <artifactId>azure-keyvault-secrets</artifactId>
   <version>4.0.0-preview.3</version>
 
-  <name>azure-keyvault-secrets</name>
+  <name>Microsoft Azure client library for KeyVault Secrets</name>
+  <description>This module contains client library for Microsoft Azure KeyVault Secrets.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java b/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
index f508cfa07f74..b96b62d4a7ec 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
+++ b/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
@@ -23,6 +23,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -110,21 +111,25 @@ public void beforeMethod() throws Exception {
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES256() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p256", P256TestKey()), JsonWebKeySignatureAlgorithm.ES256, "SHA-256");
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES256K() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p256k", P256KTestKey()), JsonWebKeySignatureAlgorithm.ES256K, "SHA-256");
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES384() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p384", P384TestKey()), JsonWebKeySignatureAlgorithm.ES384, "SHA-384");
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES521() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p521", P521TestKey()), JsonWebKeySignatureAlgorithm.ES512, "SHA-512");
     }
diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
index 956a21dfe3d7..d64ee420186b 100644
--- a/sdk/keyvault/pom.service.xml
+++ b/sdk/keyvault/pom.service.xml
@@ -1,30 +1,46 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azure</groupId>
   <artifactId>azure-keyvault-service</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <modules>
-
-    <!-- Track 1 -->
-    <module>microsoft-azure-keyvault</module>
-    <module>microsoft-azure-keyvault-core</module>
-    <module>microsoft-azure-keyvault-webkey</module>
-    <module>microsoft-azure-keyvault-cryptography</module>
-    <module>microsoft-azure-keyvault-extensions</module>
-    <module>microsoft-azure-keyvault-complete</module>
-    
-    <!-- Track 2 -->
-    <module>../core/azure-core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
-    <module>../core/azure-core-test</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
-    <module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
-    <module>azure-keyvault-keys</module>
-    <module>azure-keyvault-secrets</module>
-    
-  </modules>
-
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <profiles>
+    <profile>
+      <id>data</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>microsoft-azure-keyvault</module>
+        <module>microsoft-azure-keyvault-complete</module>
+        <module>microsoft-azure-keyvault-core</module>
+        <module>microsoft-azure-keyvault-cryptography</module>
+        <module>microsoft-azure-keyvault-extensions</module>
+        <module>microsoft-azure-keyvault-test</module>
+        <module>microsoft-azure-keyvault-webkey</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>client</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>!data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>../core/azure-core</module>        <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+        <module>../core/azure-core-test</module>        <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+        <module>../identity/azure-identity</module>        <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
+        <module>azure-keyvault-keys</module>
+        <module>azure-keyvault-secrets</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index 59e986439e6d..71afc74b13e3 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-blob</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-blob</name>
+  <name>Microsoft Azure client library for Blob Storage</name>
+  <description>This module contains client library for Microsoft Azure Blob Storage.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java
index 9cf6c224c0d3..d2d20d34c58f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java
@@ -94,8 +94,8 @@ public Mono<Response<AppendBlobItem>> create(BlobHTTPHeaders headers, Metadata m
         accessConditions = (accessConditions == null) ? new BlobAccessConditions() : accessConditions;
 
         return postProcessResponse(this.azureBlobStorage.appendBlobs().createWithRestResponseAsync(null,
-            null, 0, null, metadata, null, null,
-            null, null, headers, accessConditions.leaseAccessConditions(),
+            null, 0, null, metadata, null, null, null,
+            null, null, headers, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new AppendBlobItem(rb.deserializedHeaders())));
     }
@@ -144,10 +144,10 @@ public Mono<Response<AppendBlobItem>> appendBlock(Flux<ByteBuf> data, long lengt
             : appendBlobAccessConditions;
 
         return postProcessResponse(this.azureBlobStorage.appendBlobs().appendBlockWithRestResponseAsync(
-            null, null, data, length, null, null,
+            null, null, data, length, null, null, null,
             null, null, null, null,
             appendBlobAccessConditions.leaseAccessConditions(),
-            appendBlobAccessConditions.appendPositionAccessConditions(),
+            appendBlobAccessConditions.appendPositionAccessConditions(), null,
             appendBlobAccessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new AppendBlobItem(rb.deserializedHeaders())));
     }
@@ -201,7 +201,7 @@ public Mono<Response<AppendBlobItem>> appendBlockFromUrl(URL sourceURL, BlobRang
 
         return postProcessResponse(
             this.azureBlobStorage.appendBlobs().appendBlockFromUrlWithRestResponseAsync(null, null,
-                sourceURL, 0, sourceRange.toString(), sourceContentMD5, null, null,
+                sourceURL, 0, sourceRange.toString(), sourceContentMD5, null, null, null, null,
                 destAccessConditions.leaseAccessConditions(),
                 destAccessConditions.appendPositionAccessConditions(),
                 destAccessConditions.modifiedAccessConditions(), sourceAccessConditions, Context.NONE))
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
index b4a5e38668c6..53801a50018c 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
@@ -13,6 +13,7 @@
 import com.azure.storage.blob.implementation.AzureBlobStorageBuilder;
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
 import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.AccessTierRequired;
 import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
 import com.azure.storage.blob.models.BlobRange;
@@ -245,7 +246,7 @@ public Mono<Response<String>> startCopyFromURL(URL sourceURL, Metadata metadata,
             .sourceIfNoneMatch(sourceModifiedAccessConditions.ifNoneMatch());
 
         return postProcessResponse(this.azureBlobStorage.blobs().startCopyFromURLWithRestResponseAsync(
-            null, null, sourceURL, null, metadata, null, sourceConditions,
+            null, null, sourceURL, null, metadata, null, null, null, null, sourceConditions,
             destAccessConditions.modifiedAccessConditions(), destAccessConditions.leaseAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, rb.deserializedHeaders().copyId()));
     }
@@ -340,7 +341,7 @@ public Mono<Response<String>> copyFromURL(URL copySource, Metadata metadata, Mod
             .sourceIfNoneMatch(sourceModifiedAccessConditions.ifNoneMatch());
 
         return postProcessResponse(this.azureBlobStorage.blobs().copyFromURLWithRestResponseAsync(
-            null, null, copySource, null, metadata, null, sourceConditions,
+            null, null, copySource, null, metadata, null, null, null, sourceConditions,
             destAccessConditions.modifiedAccessConditions(), destAccessConditions.leaseAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, rb.deserializedHeaders().copyId()));
     }
@@ -413,7 +414,7 @@ Mono<DownloadAsyncResponse> download(BlobRange range, BlobAccessConditions acces
         // TODO: range is BlobRange but expected as String
         // TODO: figure out correct response
         return postProcessResponse(this.azureBlobStorage.blobs().downloadWithRestResponseAsync(
-            null, null, snapshot, null, null, range.toHeaderValue(), getMD5,
+            null, null, snapshot, null, null, range.toHeaderValue(), getMD5, null,
             null, null, null, null,
             accessConditions.leaseAccessConditions(), accessConditions.modifiedAccessConditions(), Context.NONE))
             // Convert the autorest response to a DownloadAsyncResponse, which enable reliable download.
@@ -691,7 +692,7 @@ public Mono<VoidResponse> setMetadata(Metadata metadata, BlobAccessConditions ac
 
         return postProcessResponse(this.azureBlobStorage.blobs().setMetadataWithRestResponseAsync(
             null, null, null, metadata, null, null,
-            null, null, accessConditions.leaseAccessConditions(),
+            null, null, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(VoidResponse::new);
     }
@@ -734,7 +735,7 @@ public Mono<Response<BlobAsyncClient>> createSnapshot(Metadata metadata, BlobAcc
 
         return postProcessResponse(this.azureBlobStorage.blobs().createSnapshotWithRestResponseAsync(
             null, null, null, metadata, null, null,
-            null, null, accessConditions.modifiedAccessConditions(),
+            null, null, null, accessConditions.modifiedAccessConditions(),
             accessConditions.leaseAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, this.getSnapshotClient(rb.deserializedHeaders().snapshot())));
     }
@@ -779,9 +780,10 @@ public Mono<VoidResponse> setTier(AccessTier tier) {
      */
     public Mono<VoidResponse> setTier(AccessTier tier, LeaseAccessConditions leaseAccessConditions) {
         Utility.assertNotNull("tier", tier);
+        AccessTierRequired accessTierRequired = AccessTierRequired.fromString(tier.toString());
 
         return postProcessResponse(this.azureBlobStorage.blobs().setTierWithRestResponseAsync(
-            null, null, tier, null, null, leaseAccessConditions, Context.NONE))
+            null, null, accessTierRequired, null, null, null, leaseAccessConditions, Context.NONE))
             .map(VoidResponse::new);
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java
index 162bb1917b61..91875e7a2fd5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java
@@ -152,8 +152,8 @@ public Mono<Response<BlockBlobItem>> upload(Flux<ByteBuf> data, long length, Blo
         accessConditions = accessConditions == null ? new BlobAccessConditions() : accessConditions;
 
         return postProcessResponse(this.azureBlobStorage.blockBlobs().uploadWithRestResponseAsync(null,
-            null, data, length, null, metadata, null, null,
-            null, null, headers, accessConditions.leaseAccessConditions(),
+            null, data, length, null, metadata, null, null, null,
+            null, null, null, headers, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new BlockBlobItem(rb.deserializedHeaders())));
     }
@@ -297,8 +297,8 @@ public Mono<VoidResponse> stageBlock(String base64BlockID, Flux<ByteBuf> data,
     public Mono<VoidResponse> stageBlock(String base64BlockID, Flux<ByteBuf> data, long length,
                  LeaseAccessConditions leaseAccessConditions) {
         return postProcessResponse(this.azureBlobStorage.blockBlobs().stageBlockWithRestResponseAsync(null,
-            null, base64BlockID, length, data, null, null, null,
-            null, null, null, leaseAccessConditions, Context.NONE))
+            null, base64BlockID, length, data, null, null, null, null,
+            null, null, null, leaseAccessConditions, null, Context.NONE))
             .map(VoidResponse::new);
     }
 
@@ -359,9 +359,9 @@ public Mono<VoidResponse> stageBlockFromURL(String base64BlockID, URL sourceURL,
 
         return postProcessResponse(
             this.azureBlobStorage.blockBlobs().stageBlockFromURLWithRestResponseAsync(null, null,
-                base64BlockID, 0, sourceURL, sourceRange.toHeaderValue(), sourceContentMD5, null,
+                base64BlockID, 0, sourceURL, sourceRange.toHeaderValue(), sourceContentMD5, null, null,
                 null, null, null, null,
-                leaseAccessConditions, sourceModifiedAccessConditions, Context.NONE))
+                leaseAccessConditions, null, sourceModifiedAccessConditions, Context.NONE))
             .map(VoidResponse::new);
     }
 
@@ -456,9 +456,9 @@ public Mono<Response<BlockBlobItem>> commitBlockList(List<String> base64BlockIDs
         accessConditions = accessConditions == null ? new BlobAccessConditions() : accessConditions;
 
         return postProcessResponse(this.azureBlobStorage.blockBlobs().commitBlockListWithRestResponseAsync(
-            null, null, new BlockLookupList().latest(base64BlockIDs), null, metadata,
-            null, null, null, null, headers,
-            accessConditions.leaseAccessConditions(), accessConditions.modifiedAccessConditions(), Context.NONE))
+            null, null, new BlockLookupList().latest(base64BlockIDs), null, null, null, metadata, null,
+            null, null, null, null, null, headers,
+            accessConditions.leaseAccessConditions(), null, accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new BlockBlobItem(rb.deserializedHeaders())));
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java
index 99b1524507bf..a741b2c7dba2 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java
@@ -278,7 +278,7 @@ public Mono<VoidResponse> create(Metadata metadata, PublicAccessType accessType)
         metadata = metadata == null ? new Metadata() : metadata;
 
         return postProcessResponse(this.azureBlobStorage.containers().createWithRestResponseAsync(
-            null, null, metadata, accessType, null, Context.NONE))
+            null, null, metadata, accessType, null, null, null, Context.NONE))
             .map(VoidResponse::new);
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java
index 944bb4ef8ff6..57a98ebc22d1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java
@@ -127,8 +127,8 @@ public Mono<Response<PageBlobItem>> create(long size, Long sequenceNumber, BlobH
         metadata = metadata == null ? new Metadata() : metadata;
 
         return postProcessResponse(this.azureBlobStorage.pageBlobs().createWithRestResponseAsync(null,
-            null, 0, size, null, metadata, null, null,
-            null, sequenceNumber, null, headers, accessConditions.leaseAccessConditions(),
+            null, 0, size, null, metadata, null, null, null,
+            null, sequenceNumber, null, headers, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new PageBlobItem(rb.deserializedHeaders())));
     }
@@ -189,9 +189,9 @@ public Mono<Response<PageBlobItem>> uploadPages(PageRange pageRange, Flux<ByteBu
         String pageRangeStr = pageRangeToString(pageRange);
 
         return postProcessResponse(this.azureBlobStorage.pageBlobs().uploadPagesWithRestResponseAsync(null,
-            null, body, pageRange.end() - pageRange.start() + 1, null,
+            null, body, pageRange.end() - pageRange.start() + 1, null, null,
             null, pageRangeStr, null, null, null, null,
-            pageBlobAccessConditions.leaseAccessConditions(), pageBlobAccessConditions.sequenceNumberAccessConditions(),
+            pageBlobAccessConditions.leaseAccessConditions(), null, pageBlobAccessConditions.sequenceNumberAccessConditions(),
             pageBlobAccessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new PageBlobItem(rb.deserializedHeaders())));
     }
@@ -272,7 +272,7 @@ public Mono<Response<PageBlobItem>> uploadPagesFromURL(PageRange range, URL sour
         destAccessConditions = destAccessConditions == null ? new PageBlobAccessConditions() : destAccessConditions;
 
         return postProcessResponse(this.azureBlobStorage.pageBlobs().uploadPagesFromURLWithRestResponseAsync(
-            null, null, sourceURL, sourceRangeString, 0, rangeString, sourceContentMD5,
+            null, null, sourceURL, sourceRangeString, 0, rangeString, sourceContentMD5, null,
             null, null, destAccessConditions.leaseAccessConditions(),
             destAccessConditions.sequenceNumberAccessConditions(), destAccessConditions.modifiedAccessConditions(),
             sourceAccessConditions, Context.NONE))
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
index 3439bb917017..9f220878e06d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
@@ -25,17 +25,19 @@
 import com.azure.storage.blob.models.AppendBlobsCreateResponse;
 import com.azure.storage.blob.models.AppendPositionAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import com.azure.storage.blob.models.StorageErrorException;
 import io.netty.buffer.ByteBuf;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import java.net.URL;
 import java.time.OffsetDateTime;
 import java.util.Map;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 /**
  * An instance of this class provides access to all the operations defined in
@@ -72,17 +74,17 @@ private interface AppendBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<AppendBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<AppendBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<AppendBlobsAppendBlockResponse> appendBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<AppendBlobsAppendBlockResponse> appendBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrl(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @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-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+        Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrl(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("x-ms-source-content-crc64") String sourceContentcrc64, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @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-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
     }
 
     /**
@@ -99,9 +101,10 @@ private interface AppendBlobsService {
     public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String blobType = "AppendBlob";
         final String blobContentType = null;
@@ -110,12 +113,13 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
         final String blobCacheControl = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -126,19 +130,21 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
      * @param contentLength The length of the request.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<AppendBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, Integer timeout, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String blobType = "AppendBlob";
         String blobContentType = null;
         if (blobHTTPHeaders != null) {
@@ -168,6 +174,10 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -187,7 +197,7 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -204,20 +214,22 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Context context) {
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "appendblock";
         final String leaseId = null;
         final Long maxSize = null;
         final Long appendPosition = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -229,19 +241,21 @@ public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(Str
      * @param contentLength The length of the request.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 leaseAccessConditions Additional parameters for the operation.
      * @param appendPositionAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, byte[] transactionalContentMD5, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "appendblock";
         String leaseId = null;
         if (leaseAccessConditions != null) {
@@ -255,6 +269,10 @@ public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(Str
         if (appendPositionAccessConditions != null) {
             appendPosition = appendPositionAccessConditions.appendPosition();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -272,9 +290,10 @@ public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(Str
             ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
         }
         String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -302,11 +321,13 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
         String sourceContentMD5Converted = null;
+        String sourceContentcrc64Converted = null;
+        String transactionalContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
-        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, timeout, contentLength, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, contentLength, transactionalContentMD5Converted, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -318,7 +339,9 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
      * @param contentLength The length of the request.
      * @param sourceRange Bytes of source data in the specified range.
      * @param sourceContentMD5 Specify the md5 calculated for the range of bytes that must be read from the copy source.
+     * @param sourceContentcrc64 Specify the crc64 calculated for the range of bytes that must be read from the copy source.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
      * @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 leaseAccessConditions Additional parameters for the operation.
      * @param appendPositionAccessConditions Additional parameters for the operation.
@@ -329,7 +352,7 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestResponseAsync(String containerName, String blob, URL sourceUrl, long contentLength, String sourceRange, byte[] sourceContentMD5, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+    public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestResponseAsync(String containerName, String blob, URL sourceUrl, long contentLength, String sourceRange, byte[] sourceContentMD5, byte[] sourceContentcrc64, Integer timeout, byte[] transactionalContentMD5, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
         final String comp = "appendblock";
         String leaseId = null;
         if (leaseAccessConditions != null) {
@@ -376,10 +399,12 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
             sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
         }
         String sourceContentMD5Converted = Base64Util.encodeToString(sourceContentMD5);
+        String sourceContentcrc64Converted = Base64Util.encodeToString(sourceContentcrc64);
+        String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
         DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
-        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, timeout, contentLength, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, contentLength, transactionalContentMD5Converted, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java
index fa28f6e26d0e..fe79309a238b 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java
@@ -7,6 +7,7 @@
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.implementation.RestProxy;
 import com.azure.core.implementation.annotation.ServiceClientBuilder;
+import com.azure.storage.blob.models.PathRenameMode;
 
 /**
  * A builder for creating a new instance of the AzureBlobStorage type.
@@ -45,6 +46,38 @@ public AzureBlobStorageBuilder version(String version) {
         return this;
     }
 
+    /*
+     * The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     */
+    private String filter;
+
+    /**
+     * Sets The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     *
+     * @param filter the filter value.
+     * @return the AzureBlobStorageBuilder.
+     */
+    public AzureBlobStorageBuilder filter(String filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /*
+     * Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'
+     */
+    private PathRenameMode pathRenameMode;
+
+    /**
+     * Sets Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     *
+     * @param pathRenameMode the pathRenameMode value.
+     * @return the AzureBlobStorageBuilder.
+     */
+    public AzureBlobStorageBuilder pathRenameMode(PathRenameMode pathRenameMode) {
+        this.pathRenameMode = pathRenameMode;
+        return this;
+    }
+
     /*
      * The HTTP pipeline to send requests through
      */
@@ -67,6 +100,9 @@ public AzureBlobStorageBuilder pipeline(HttpPipeline pipeline) {
      * @return an instance of AzureBlobStorageImpl.
      */
     public AzureBlobStorageImpl build() {
+        if (version == null) {
+            this.version = "2019-02-02";
+        }
         if (pipeline == null) {
             this.pipeline = RestProxy.createDefaultPipeline();
         }
@@ -76,8 +112,12 @@ public AzureBlobStorageImpl build() {
         }
         if (this.version != null) {
             client.setVersion(this.version);
-        } else {
-            client.setVersion("2018-11-09");
+        }
+        if (this.filter != null) {
+            client.setFilter(this.filter);
+        }
+        if (this.pathRenameMode != null) {
+            client.setPathRenameMode(this.pathRenameMode);
         }
         return client;
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java
index 5fc9bc8ae273..d9f48fbf8799 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java
@@ -6,6 +6,7 @@
 
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.implementation.RestProxy;
+import com.azure.storage.blob.models.PathRenameMode;
 
 /**
  * Initializes a new instance of the AzureBlobStorage type.
@@ -29,9 +30,11 @@ public String getUrl() {
      * Sets The URL of the service account, container, or blob that is the targe of the desired operation.
      *
      * @param url the url value.
+     * @return the service client itself.
      */
-    void setUrl(String url) {
+    AzureBlobStorageImpl setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     /**
@@ -52,9 +55,61 @@ public String getVersion() {
      * Sets Specifies the version of the operation to use for this request.
      *
      * @param version the version value.
+     * @return the service client itself.
      */
-    void setVersion(String version) {
+    AzureBlobStorageImpl setVersion(String version) {
         this.version = version;
+        return this;
+    }
+
+    /**
+     * The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     */
+    private String filter;
+
+    /**
+     * Gets The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     *
+     * @return the filter value.
+     */
+    public String getFilter() {
+        return this.filter;
+    }
+
+    /**
+     * Sets The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     *
+     * @param filter the filter value.
+     * @return the service client itself.
+     */
+    AzureBlobStorageImpl setFilter(String filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /**
+     * Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     */
+    private PathRenameMode pathRenameMode;
+
+    /**
+     * Gets Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     *
+     * @return the pathRenameMode value.
+     */
+    public PathRenameMode getPathRenameMode() {
+        return this.pathRenameMode;
+    }
+
+    /**
+     * Sets Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     *
+     * @param pathRenameMode the pathRenameMode value.
+     * @return the service client itself.
+     */
+    AzureBlobStorageImpl setPathRenameMode(PathRenameMode pathRenameMode) {
+        this.pathRenameMode = pathRenameMode;
+        return this;
     }
 
     /**
@@ -99,6 +154,20 @@ public ContainersImpl containers() {
         return this.containers;
     }
 
+    /**
+     * The DirectorysImpl object to access its operations.
+     */
+    private DirectorysImpl directorys;
+
+    /**
+     * Gets the DirectorysImpl object to access its operations.
+     *
+     * @return the DirectorysImpl object.
+     */
+    public DirectorysImpl directorys() {
+        return this.directorys;
+    }
+
     /**
      * The BlobsImpl object to access its operations.
      */
@@ -171,6 +240,7 @@ public AzureBlobStorageImpl(HttpPipeline httpPipeline) {
         this.httpPipeline = httpPipeline;
         this.services = new ServicesImpl(this);
         this.containers = new ContainersImpl(this);
+        this.directorys = new DirectorysImpl(this);
         this.blobs = new BlobsImpl(this);
         this.pageBlobs = new PageBlobsImpl(this);
         this.appendBlobs = new AppendBlobsImpl(this);
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
index eba1efa297e4..9f75f3503418 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
@@ -6,6 +6,7 @@
 
 import com.azure.core.implementation.DateTimeRfc1123;
 import com.azure.core.implementation.RestProxy;
+import com.azure.core.implementation.annotation.BodyParam;
 import com.azure.core.implementation.annotation.Delete;
 import com.azure.core.implementation.annotation.ExpectedResponses;
 import com.azure.core.implementation.annotation.Get;
@@ -22,7 +23,8 @@
 import com.azure.core.implementation.annotation.UnexpectedResponseExceptionType;
 import com.azure.core.implementation.util.Base64Util;
 import com.azure.core.util.Context;
-import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.AccessTierOptional;
+import com.azure.storage.blob.models.AccessTierRequired;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
 import com.azure.storage.blob.models.BlobsAbortCopyFromURLResponse;
 import com.azure.storage.blob.models.BlobsAcquireLeaseResponse;
@@ -34,17 +36,26 @@
 import com.azure.storage.blob.models.BlobsDownloadResponse;
 import com.azure.storage.blob.models.BlobsGetAccountInfoResponse;
 import com.azure.storage.blob.models.BlobsGetPropertiesResponse;
+import com.azure.storage.blob.models.BlobsGetTagsResponse;
 import com.azure.storage.blob.models.BlobsReleaseLeaseResponse;
+import com.azure.storage.blob.models.BlobsRenameResponse;
 import com.azure.storage.blob.models.BlobsRenewLeaseResponse;
 import com.azure.storage.blob.models.BlobsSetHTTPHeadersResponse;
 import com.azure.storage.blob.models.BlobsSetMetadataResponse;
+import com.azure.storage.blob.models.BlobsSetTagsResponse;
 import com.azure.storage.blob.models.BlobsSetTierResponse;
 import com.azure.storage.blob.models.BlobsStartCopyFromURLResponse;
 import com.azure.storage.blob.models.BlobsUndeleteResponse;
+import com.azure.storage.blob.models.BlobTags;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
+import com.azure.storage.blob.models.DataLakeStorageErrorException;
 import com.azure.storage.blob.models.DeleteSnapshotsOptionType;
+import com.azure.storage.blob.models.DirectoryHttpHeaders;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
+import com.azure.storage.blob.models.PathRenameMode;
+import com.azure.storage.blob.models.RehydratePriority;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import com.azure.storage.blob.models.StorageErrorException;
 import java.net.URL;
@@ -87,18 +98,23 @@ private interface BlobsService {
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200, 206})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsDownloadResponse> download(@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-range") String range, @HeaderParam("x-ms-range-get-content-md5") Boolean rangeGetContentMD5, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlobsDownloadResponse> download(@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-range") String range, @HeaderParam("x-ms-range-get-content-md5") Boolean rangeGetContentMD5, @HeaderParam("x-ms-range-get-content-crc64") Boolean rangeGetContentCRC64, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Head("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsGetPropertiesResponse> getProperties(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlobsGetPropertiesResponse> getProperties(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Delete("{containerName}/{blob}")
         @ExpectedResponses({202})
         @UnexpectedResponseExceptionType(StorageErrorException.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-delete-snapshots") DeleteSnapshotsOptionType deleteSnapshots, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
+        @Put("{filesystem}/{path}")
+        @ExpectedResponses({201})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<BlobsRenameResponse> rename(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @QueryParam("mode") PathRenameMode pathRenameMode, @HeaderParam("x-ms-rename-source") String renameSource, @HeaderParam("x-ms-properties") String directoryProperties, @HeaderParam("x-ms-permissions") String posixPermissions, @HeaderParam("x-ms-umask") String posixUmask, @HeaderParam("x-ms-source-lease-id") String sourceLeaseId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-cache-control") String cacheControl, @HeaderParam("x-ms-content-type") String contentType, @HeaderParam("x-ms-content-encoding") String contentEncoding, @HeaderParam("x-ms-content-language") String contentLanguage, @HeaderParam("x-ms-content-disposition") String contentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @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-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+
         @Put("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
@@ -112,7 +128,7 @@ private interface BlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsSetMetadataResponse> setMetadata(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlobsSetMetadataResponse> setMetadata(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
@@ -142,17 +158,17 @@ private interface BlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsCreateSnapshotResponse> createSnapshot(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @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-lease-id") String leaseId, Context context);
+        Mono<BlobsCreateSnapshotResponse> createSnapshot(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @QueryParam("x-ms-encryption-scope") String encryptionScope, @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-lease-id") String leaseId, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({202})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsStartCopyFromURLResponse> startCopyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @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 sourceIfMatch, @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 ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlobsStartCopyFromURLResponse> startCopyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @HeaderParam("x-ms-rehydrate-priority") RehydratePriority rehydratePriority, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @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 sourceIfMatch, @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 ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({202})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsCopyFromURLResponse> copyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-requires-sync") String xMsRequiresSync, @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 sourceIfMatch, @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 ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlobsCopyFromURLResponse> copyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-requires-sync") String xMsRequiresSync, @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 sourceIfMatch, @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 ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({204})
@@ -162,16 +178,26 @@ private interface BlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({200, 202})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsSetTierResponse> setTier(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @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, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlobsSetTierResponse> setTier(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-access-tier") AccessTierRequired tier, @HeaderParam("x-ms-rehydrate-priority") RehydratePriority rehydratePriority, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
 
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
         Mono<BlobsGetAccountInfoResponse> getAccountInfo(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-version") String version, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
+
+        @Put("{containerName}/{blob}")
+        @ExpectedResponses({204})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<BlobsSetTagsResponse> setTags(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/xml; charset=utf-8") BlobTags tags, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
+
+        @Get("{containerName}/{blob}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<BlobsGetTagsResponse> getTags(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
     }
 
     /**
-     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.
+     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or version.
      *
      * @param containerName The container name.
      * @param blob The blob name.
@@ -186,20 +212,21 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
         final Integer timeout = null;
         final String range = null;
         final Boolean rangeGetContentMD5 = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final Boolean rangeGetContentCRC64 = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String leaseId = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, rangeGetContentCRC64, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
-     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.
+     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or version.
      *
      * @param containerName The container name.
      * @param blob The blob name.
@@ -208,9 +235,10 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param range Return only the bytes of the blob in the specified range.
      * @param rangeGetContentMD5 When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param rangeGetContentCRC64 When set to true and specified together with the Range, the service returns the CRC64 hash for the range, as long as the range is less than or equal to 4 MB in size.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 leaseAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -219,7 +247,7 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String range, Boolean rangeGetContentMD5, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String range, Boolean rangeGetContentMD5, Boolean rangeGetContentCRC64, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
@@ -242,7 +270,7 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, rangeGetContentCRC64, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -259,16 +287,16 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
         final String snapshot = null;
         final String versionId = null;
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String leaseId = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -279,9 +307,9 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
      * @param snapshot The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob"&gt;Creating a Snapshot of a Blob.&lt;/a&gt;.
      * @param versionId The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 leaseAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -290,7 +318,7 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
@@ -313,7 +341,7 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -383,6 +411,126 @@ public Mono<BlobsDeleteResponse> deleteWithRestResponseAsync(String containerNam
         return service.delete(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, deleteSnapshots, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
+    /**
+     * Rename a blob/file.  By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken.  This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @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<BlobsRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Context context) {
+        final Integer timeout = null;
+        final String directoryProperties = null;
+        final String posixPermissions = null;
+        final String posixUmask = null;
+        final String sourceLeaseId = null;
+        final String requestId = null;
+        final String cacheControl = null;
+        final String contentType = null;
+        final String contentEncoding = null;
+        final String contentLanguage = null;
+        final String contentDisposition = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        final String sourceIfMatch = null;
+        final String sourceIfNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
+    /**
+     * Rename a blob/file.  By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken.  This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param directoryProperties Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs "n1=v1, n2=v2, ...", where each value is base64 encoded.
+     * @param posixPermissions Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+     * @param posixUmask Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used.
+     * @param sourceLeaseId A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match.
+     * @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 directoryHttpHeaders Additional parameters for the operation.
+     * @param leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @param sourceModifiedAccessConditions Additional parameters for the operation.
+     * @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<BlobsRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Integer timeout, String directoryProperties, String posixPermissions, String posixUmask, String sourceLeaseId, String requestId, DirectoryHttpHeaders directoryHttpHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+        String cacheControl = null;
+        if (directoryHttpHeaders != null) {
+            cacheControl = directoryHttpHeaders.cacheControl();
+        }
+        String contentType = null;
+        if (directoryHttpHeaders != null) {
+            contentType = directoryHttpHeaders.contentType();
+        }
+        String contentEncoding = null;
+        if (directoryHttpHeaders != null) {
+            contentEncoding = directoryHttpHeaders.contentEncoding();
+        }
+        String contentLanguage = null;
+        if (directoryHttpHeaders != null) {
+            contentLanguage = directoryHttpHeaders.contentLanguage();
+        }
+        String contentDisposition = null;
+        if (directoryHttpHeaders != null) {
+            contentDisposition = directoryHttpHeaders.contentDisposition();
+        }
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        OffsetDateTime sourceIfModifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
+        }
+        OffsetDateTime sourceIfUnmodifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfUnmodifiedSince = sourceModifiedAccessConditions.sourceIfUnmodifiedSince();
+        }
+        String sourceIfMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfMatch = sourceModifiedAccessConditions.sourceIfMatch();
+        }
+        String sourceIfNoneMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
     /**
      * Undelete a blob that was previously soft deleted.
      *
@@ -525,17 +673,18 @@ public Mono<BlobsSetHTTPHeadersResponse> setHTTPHeadersWithRestResponseAsync(Str
     public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String containerName, String blob, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "metadata";
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -545,23 +694,28 @@ public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String co
      * @param blob The blob name.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "metadata";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -580,7 +734,7 @@ public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String co
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -905,17 +1059,18 @@ public Mono<BlobsBreakLeaseResponse> breakLeaseWithRestResponseAsync(String cont
     public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(String containerName, String blob, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "snapshot";
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         final String leaseId = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -925,10 +1080,11 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
      * @param blob The blob name.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
      * @param context The context to associate with this operation.
@@ -936,8 +1092,12 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
         final String comp = "snapshot";
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -960,7 +1120,7 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -977,6 +1137,9 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
     public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
+        final String tags = null;
+        final AccessTierOptional tier = null;
+        final RehydratePriority rehydratePriority = null;
         final String requestId = null;
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
@@ -987,7 +1150,7 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, rehydratePriority, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -998,6 +1161,9 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
      * @param copySource Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
+     * @param rehydratePriority Optional: Indicates the priority with which to rehydrate an archived blob. Possible values include: 'High', 'Standard'.
      * @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 sourceModifiedAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -1007,7 +1173,7 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String tags, AccessTierOptional tier, RehydratePriority rehydratePriority, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
         OffsetDateTime sourceIfModifiedSince = null;
         if (sourceModifiedAccessConditions != null) {
             sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
@@ -1048,7 +1214,7 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, rehydratePriority, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -1065,6 +1231,8 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
     public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
+        final String tags = null;
+        final AccessTierOptional tier = null;
         final String requestId = null;
         final String xMsRequiresSync = "true";
         final String sourceIfMatch = null;
@@ -1076,7 +1244,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -1087,6 +1255,8 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
      * @param copySource Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
      * @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 sourceModifiedAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -1096,7 +1266,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String tags, AccessTierOptional tier, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
         final String xMsRequiresSync = "true";
         OffsetDateTime sourceIfModifiedSince = null;
         if (sourceModifiedAccessConditions != null) {
@@ -1138,7 +1308,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -1196,12 +1366,13 @@ public Mono<BlobsAbortCopyFromURLResponse> abortCopyFromURLWithRestResponseAsync
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTier tier, Context context) {
+    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTierRequired tier, Context context) {
         final Integer timeout = null;
+        final RehydratePriority rehydratePriority = null;
         final String requestId = null;
         final String comp = "tier";
         final String leaseId = null;
-        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, this.client.getVersion(), requestId, comp, leaseId, context);
+        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, rehydratePriority, this.client.getVersion(), requestId, comp, leaseId, context);
     }
 
     /**
@@ -1211,6 +1382,7 @@ public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerN
      * @param blob The blob name.
      * @param tier Indicates the tier to be set on the blob. Possible values include: 'P4', 'P6', 'P10', 'P20', 'P30', 'P40', 'P50', 'Hot', 'Cool', 'Archive'.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param rehydratePriority Optional: Indicates the priority with which to rehydrate an archived blob. Possible values include: 'High', 'Standard'.
      * @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 leaseAccessConditions Additional parameters for the operation.
      * @param context The context to associate with this operation.
@@ -1218,13 +1390,13 @@ public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerN
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTier tier, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTierRequired tier, Integer timeout, RehydratePriority rehydratePriority, String requestId, LeaseAccessConditions leaseAccessConditions, Context context) {
         final String comp = "tier";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
-        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, this.client.getVersion(), requestId, comp, leaseId, context);
+        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, rehydratePriority, this.client.getVersion(), requestId, comp, leaseId, context);
     }
 
     /**
@@ -1242,4 +1414,88 @@ public Mono<BlobsGetAccountInfoResponse> getAccountInfoWithRestResponseAsync(Str
         final String comp = "properties";
         return service.getAccountInfo(containerName, blob, this.client.getUrl(), this.client.getVersion(), restype, comp, context);
     }
+
+    /**
+     * The Set Blob Tags operation sets tags for the specified blob. This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param tags the BlobTags value.
+     * @param contentLength The length of the request.
+     * @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<BlobsSetTagsResponse> setTagsWithRestResponseAsync(String containerName, String blob, BlobTags tags, long contentLength, Context context) {
+        final Integer timeout = null;
+        final String requestId = null;
+        final String comp = "tags";
+        String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
+        return service.setTags(containerName, blob, this.client.getUrl(), tags, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Set Blob Tags operation sets tags for the specified blob. This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param tags the BlobTags value.
+     * @param contentLength The length of the request.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
+     * @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 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<BlobsSetTagsResponse> setTagsWithRestResponseAsync(String containerName, String blob, BlobTags tags, long contentLength, Integer timeout, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, String requestId, Context context) {
+        final String comp = "tags";
+        String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
+        return service.setTags(containerName, blob, this.client.getUrl(), tags, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Get Blob Tags operation returns all tags for the specified blob, snapshot, or version.  This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param contentLength The length of the request.
+     * @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<BlobsGetTagsResponse> getTagsWithRestResponseAsync(String containerName, String blob, long contentLength, Context context) {
+        final Integer timeout = null;
+        final String snapshot = null;
+        final String versionId = null;
+        final String requestId = null;
+        final String comp = "tags";
+        return service.getTags(containerName, blob, this.client.getUrl(), timeout, contentLength, snapshot, versionId, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Get Blob Tags operation returns all tags for the specified blob, snapshot, or version.  This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param contentLength The length of the request.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param snapshot The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob"&gt;Creating a Snapshot of a Blob.&lt;/a&gt;.
+     * @param versionId The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve.
+     * @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 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<BlobsGetTagsResponse> getTagsWithRestResponseAsync(String containerName, String blob, long contentLength, Integer timeout, String snapshot, String versionId, String requestId, Context context) {
+        final String comp = "tags";
+        return service.getTags(containerName, blob, this.client.getUrl(), timeout, contentLength, snapshot, versionId, this.client.getVersion(), requestId, comp, context);
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
index 390c2436de9a..ec226b60e1d8 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.implementation.annotation.UnexpectedResponseExceptionType;
 import com.azure.core.implementation.util.Base64Util;
 import com.azure.core.util.Context;
+import com.azure.storage.blob.models.AccessTierOptional;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
 import com.azure.storage.blob.models.BlockBlobsCommitBlockListResponse;
 import com.azure.storage.blob.models.BlockBlobsGetBlockListResponse;
@@ -29,6 +30,7 @@
 import com.azure.storage.blob.models.BlockBlobsUploadResponse;
 import com.azure.storage.blob.models.BlockListType;
 import com.azure.storage.blob.models.BlockLookupList;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
@@ -76,22 +78,22 @@ private interface BlockBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsUploadResponse> upload(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlockBlobsUploadResponse> upload(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsStageBlockResponse> stageBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlockBlobsStageBlockResponse> stageBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @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 sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+        Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("x-ms-source-content-crc64") String sourceContentcrc64, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @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 sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsCommitBlockListResponse> commitBlockList(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @BodyParam("application/xml; charset=utf-8") BlockLookupList blocks, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlockBlobsCommitBlockListResponse> commitBlockList(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @BodyParam("application/xml; charset=utf-8") BlockLookupList blocks, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200})
@@ -114,9 +116,11 @@ private interface BlockBlobsService {
     public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
+        final AccessTierOptional tier = null;
         final String requestId = null;
         final String blobType = "BlockBlob";
         final String blobContentType = null;
@@ -125,12 +129,13 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
         final String blobCacheControl = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -142,19 +147,22 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
      * @param contentLength The length of the request.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
      * @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 blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, AccessTierOptional tier, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String blobType = "BlockBlob";
         String blobContentType = null;
         if (blobHTTPHeaders != null) {
@@ -184,6 +192,10 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -203,7 +215,7 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -221,14 +233,16 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, Flux<ByteBuf> body, Context context) {
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "block";
         final String leaseId = null;
+        final String encryptionScope = null;
         String transactionalContentMD5Converted = null;
-        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, body, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, context);
+        String transactionalContentCrc64Converted = null;
+        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, body, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, context);
     }
 
     /**
@@ -240,25 +254,32 @@ public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String
      * @param contentLength The length of the request.
      * @param body Initial data.
      * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @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<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, Flux<ByteBuf> body, byte[] transactionalContentMD5, Integer timeout, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, Flux<ByteBuf> body, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, Integer timeout, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, Context context) {
         final String comp = "block";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
-        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, body, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, context);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
+        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, body, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, context);
     }
 
     /**
@@ -277,18 +298,20 @@ public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String
     public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, URL sourceUrl, Context context) {
         final String sourceRange = null;
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "block";
         final String leaseId = null;
+        final String encryptionScope = null;
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
         String sourceContentMD5Converted = null;
+        String sourceContentcrc64Converted = null;
         DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
-        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -301,24 +324,30 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestRespon
      * @param sourceUrl Specify a URL to the copy source.
      * @param sourceRange Bytes of source data in the specified range.
      * @param sourceContentMD5 Specify the md5 calculated for the range of bytes that must be read from the copy source.
+     * @param sourceContentcrc64 Specify the crc64 calculated for the range of bytes that must be read from the copy source.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param sourceModifiedAccessConditions Additional parameters for the operation.
      * @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<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, URL sourceUrl, String sourceRange, byte[] sourceContentMD5, Integer timeout, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+    public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, URL sourceUrl, String sourceRange, byte[] sourceContentMD5, byte[] sourceContentcrc64, Integer timeout, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
         final String comp = "block";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime sourceIfModifiedSince = null;
         if (sourceModifiedAccessConditions != null) {
             sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
@@ -336,9 +365,10 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestRespon
             sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
         }
         String sourceContentMD5Converted = Base64Util.encodeToString(sourceContentMD5);
+        String sourceContentcrc64Converted = Base64Util.encodeToString(sourceContentcrc64);
         DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
-        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -355,9 +385,11 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestRespon
     public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAsync(String containerName, String blob, BlockLookupList blocks, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
+        final AccessTierOptional tier = null;
         final String requestId = null;
         final String comp = "blocklist";
         final String blobCacheControl = null;
@@ -366,12 +398,15 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
         final String blobContentLanguage = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
+        String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, transactionalContentMD5Converted, transactionalContentCrc64Converted, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -381,20 +416,25 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
      * @param blob The blob name.
      * @param blocks the BlockLookupList value.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
      * @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 blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAsync(String containerName, String blob, BlockLookupList blocks, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAsync(String containerName, String blob, BlockLookupList blocks, Integer timeout, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, AccessTierOptional tier, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "blocklist";
         String blobCacheControl = null;
         if (blobHTTPHeaders != null) {
@@ -424,6 +464,10 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -440,10 +484,12 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
         if (modifiedAccessConditions != null) {
             ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
         }
+        String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, transactionalContentMD5Converted, transactionalContentCrc64Converted, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java
index efb3b64cdf8b..5a594d600a85 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java
@@ -83,7 +83,7 @@ private interface ContainersService {
         @Put("{containerName}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ContainersCreateResponse> create(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-blob-public-access") PublicAccessType access, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, Context context);
+        Mono<ContainersCreateResponse> create(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-blob-public-access") PublicAccessType access, @HeaderParam("x-ms-default-encryption-scope") String defaultEncryptionScope, @HeaderParam("x-ms-deny-encryption-scope-override") Boolean denyEncryptionScopeOverride, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, Context context);
 
         @Get("{containerName}")
         @ExpectedResponses({200})
@@ -138,12 +138,12 @@ private interface ContainersService {
         @Get("{containerName}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ContainersListBlobFlatSegmentResponse> listBlobFlatSegment(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("prefix") String prefix, @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, Context context);
+        Mono<ContainersListBlobFlatSegmentResponse> listBlobFlatSegment(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("marker") String marker1, @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, Context context);
 
         @Get("{containerName}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ContainersListBlobHierarchySegmentResponse> listBlobHierarchySegment(@PathParam("containerName") String containerName, @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, Context context);
+        Mono<ContainersListBlobHierarchySegmentResponse> listBlobHierarchySegment(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("delimiter") String delimiter, @QueryParam("marker") String marker1, @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, Context context);
 
         @Get("{containerName}")
         @ExpectedResponses({200})
@@ -164,9 +164,11 @@ public Mono<ContainersCreateResponse> createWithRestResponseAsync(String contain
         final Integer timeout = null;
         final Map<String, String> metadata = null;
         final PublicAccessType access = null;
+        final String defaultEncryptionScope = null;
+        final Boolean denyEncryptionScopeOverride = null;
         final String requestId = null;
         final String restype = "container";
-        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, this.client.getVersion(), requestId, restype, context);
+        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, defaultEncryptionScope, denyEncryptionScopeOverride, this.client.getVersion(), requestId, restype, context);
     }
 
     /**
@@ -176,15 +178,17 @@ public Mono<ContainersCreateResponse> createWithRestResponseAsync(String contain
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
      * @param access Specifies whether data in the container may be accessed publicly and the level of access. Possible values include: 'container', 'blob'.
+     * @param defaultEncryptionScope Optional. Specifies the default encryption scope on the container. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param denyEncryptionScopeOverride Optional. Specifies whether to deny encryption scope override provided in the request or not. If true, reject the request with encryption scope. If false, encryption is performed using encryption scope provided in the request. For more information, see Encryption at Rest for Azure Storage Services.
      * @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 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<ContainersCreateResponse> createWithRestResponseAsync(String containerName, Integer timeout, Map<String, String> metadata, PublicAccessType access, String requestId, Context context) {
+    public Mono<ContainersCreateResponse> createWithRestResponseAsync(String containerName, Integer timeout, Map<String, String> metadata, PublicAccessType access, String defaultEncryptionScope, Boolean denyEncryptionScopeOverride, String requestId, Context context) {
         final String restype = "container";
-        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, this.client.getVersion(), requestId, restype, context);
+        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, defaultEncryptionScope, denyEncryptionScopeOverride, this.client.getVersion(), requestId, restype, context);
     }
 
     /**
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/DirectorysImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/DirectorysImpl.java
new file mode 100644
index 000000000000..1085a8ace909
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/DirectorysImpl.java
@@ -0,0 +1,363 @@
+// 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;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.RestProxy;
+import com.azure.core.implementation.annotation.Delete;
+import com.azure.core.implementation.annotation.ExpectedResponses;
+import com.azure.core.implementation.annotation.HeaderParam;
+import com.azure.core.implementation.annotation.Host;
+import com.azure.core.implementation.annotation.HostParam;
+import com.azure.core.implementation.annotation.PathParam;
+import com.azure.core.implementation.annotation.Put;
+import com.azure.core.implementation.annotation.QueryParam;
+import com.azure.core.implementation.annotation.ReturnType;
+import com.azure.core.implementation.annotation.ServiceInterface;
+import com.azure.core.implementation.annotation.ServiceMethod;
+import com.azure.core.implementation.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.util.Context;
+import com.azure.storage.blob.models.DataLakeStorageErrorException;
+import com.azure.storage.blob.models.DirectoryHttpHeaders;
+import com.azure.storage.blob.models.DirectorysCreateResponse;
+import com.azure.storage.blob.models.DirectorysDeleteResponse;
+import com.azure.storage.blob.models.DirectorysRenameResponse;
+import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.ModifiedAccessConditions;
+import com.azure.storage.blob.models.PathRenameMode;
+import com.azure.storage.blob.models.SourceModifiedAccessConditions;
+import java.time.OffsetDateTime;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in
+ * Directorys.
+ */
+public final class DirectorysImpl {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private DirectorysService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private AzureBlobStorageImpl client;
+
+    /**
+     * Initializes an instance of DirectorysImpl.
+     *
+     * @param client the instance of the service client containing this operation class.
+     */
+    public DirectorysImpl(AzureBlobStorageImpl client) {
+        this.service = RestProxy.create(DirectorysService.class, client.getHttpPipeline());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AzureBlobStorageDirectorys
+     * to be used by the proxy service to perform REST calls.
+     */
+    @Host("{url}")
+    @ServiceInterface(name = "AzureBlobStorageDirectorys")
+    private interface DirectorysService {
+        @Put("{filesystem}/{path}")
+        @ExpectedResponses({201})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<DirectorysCreateResponse> create(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-properties") String directoryProperties, @HeaderParam("x-ms-permissions") String posixPermissions, @HeaderParam("x-ms-umask") String posixUmask, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("resource") String resource, @HeaderParam("x-ms-cache-control") String cacheControl, @HeaderParam("x-ms-content-type") String contentType, @HeaderParam("x-ms-content-encoding") String contentEncoding, @HeaderParam("x-ms-content-language") String contentLanguage, @HeaderParam("x-ms-content-disposition") String contentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+
+        @Put("{filesystem}/{path}")
+        @ExpectedResponses({201})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<DirectorysRenameResponse> rename(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @QueryParam("continuation") String marker, @QueryParam("mode") PathRenameMode pathRenameMode, @HeaderParam("x-ms-rename-source") String renameSource, @HeaderParam("x-ms-properties") String directoryProperties, @HeaderParam("x-ms-permissions") String posixPermissions, @HeaderParam("x-ms-umask") String posixUmask, @HeaderParam("x-ms-source-lease-id") String sourceLeaseId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-cache-control") String cacheControl, @HeaderParam("x-ms-content-type") String contentType, @HeaderParam("x-ms-content-encoding") String contentEncoding, @HeaderParam("x-ms-content-language") String contentLanguage, @HeaderParam("x-ms-content-disposition") String contentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @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-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+
+        @Delete("{filesystem}/{path}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<DirectorysDeleteResponse> delete(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @QueryParam("recursive") boolean recursiveDirectoryDelete, @QueryParam("continuation") String marker, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+    }
+
+    /**
+     * Create a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @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<DirectorysCreateResponse> createWithRestResponseAsync(String filesystem, String path, Context context) {
+        final Integer timeout = null;
+        final String directoryProperties = null;
+        final String posixPermissions = null;
+        final String posixUmask = null;
+        final String requestId = null;
+        final String resource = "directory";
+        final String cacheControl = null;
+        final String contentType = null;
+        final String contentEncoding = null;
+        final String contentLanguage = null;
+        final String contentDisposition = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        return service.create(filesystem, path, this.client.getUrl(), timeout, directoryProperties, posixPermissions, posixUmask, this.client.getVersion(), requestId, resource, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+
+    /**
+     * Create a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param directoryProperties Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs "n1=v1, n2=v2, ...", where each value is base64 encoded.
+     * @param posixPermissions Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+     * @param posixUmask Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used.
+     * @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 directoryHttpHeaders Additional parameters for the operation.
+     * @param leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @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<DirectorysCreateResponse> createWithRestResponseAsync(String filesystem, String path, Integer timeout, String directoryProperties, String posixPermissions, String posixUmask, String requestId, DirectoryHttpHeaders directoryHttpHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+        final String resource = "directory";
+        String cacheControl = null;
+        if (directoryHttpHeaders != null) {
+            cacheControl = directoryHttpHeaders.cacheControl();
+        }
+        String contentType = null;
+        if (directoryHttpHeaders != null) {
+            contentType = directoryHttpHeaders.contentType();
+        }
+        String contentEncoding = null;
+        if (directoryHttpHeaders != null) {
+            contentEncoding = directoryHttpHeaders.contentEncoding();
+        }
+        String contentLanguage = null;
+        if (directoryHttpHeaders != null) {
+            contentLanguage = directoryHttpHeaders.contentLanguage();
+        }
+        String contentDisposition = null;
+        if (directoryHttpHeaders != null) {
+            contentDisposition = directoryHttpHeaders.contentDisposition();
+        }
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        return service.create(filesystem, path, this.client.getUrl(), timeout, directoryProperties, posixPermissions, posixUmask, this.client.getVersion(), requestId, resource, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+
+    /**
+     * Rename a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests. For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations). To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @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<DirectorysRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Context context) {
+        final Integer timeout = null;
+        final String marker = null;
+        final String directoryProperties = null;
+        final String posixPermissions = null;
+        final String posixUmask = null;
+        final String sourceLeaseId = null;
+        final String requestId = null;
+        final String cacheControl = null;
+        final String contentType = null;
+        final String contentEncoding = null;
+        final String contentLanguage = null;
+        final String contentDisposition = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        final String sourceIfMatch = null;
+        final String sourceIfNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, marker, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
+    /**
+     * Rename a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests. For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations). To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param marker When renaming a directory, the number of paths that are renamed with each invocation is limited.  If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header.  When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory.
+     * @param directoryProperties Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs "n1=v1, n2=v2, ...", where each value is base64 encoded.
+     * @param posixPermissions Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+     * @param posixUmask Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used.
+     * @param sourceLeaseId A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match.
+     * @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 directoryHttpHeaders Additional parameters for the operation.
+     * @param leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @param sourceModifiedAccessConditions Additional parameters for the operation.
+     * @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<DirectorysRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Integer timeout, String marker, String directoryProperties, String posixPermissions, String posixUmask, String sourceLeaseId, String requestId, DirectoryHttpHeaders directoryHttpHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+        String cacheControl = null;
+        if (directoryHttpHeaders != null) {
+            cacheControl = directoryHttpHeaders.cacheControl();
+        }
+        String contentType = null;
+        if (directoryHttpHeaders != null) {
+            contentType = directoryHttpHeaders.contentType();
+        }
+        String contentEncoding = null;
+        if (directoryHttpHeaders != null) {
+            contentEncoding = directoryHttpHeaders.contentEncoding();
+        }
+        String contentLanguage = null;
+        if (directoryHttpHeaders != null) {
+            contentLanguage = directoryHttpHeaders.contentLanguage();
+        }
+        String contentDisposition = null;
+        if (directoryHttpHeaders != null) {
+            contentDisposition = directoryHttpHeaders.contentDisposition();
+        }
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        OffsetDateTime sourceIfModifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
+        }
+        OffsetDateTime sourceIfUnmodifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfUnmodifiedSince = sourceModifiedAccessConditions.sourceIfUnmodifiedSince();
+        }
+        String sourceIfMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfMatch = sourceModifiedAccessConditions.sourceIfMatch();
+        }
+        String sourceIfNoneMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, marker, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
+    /**
+     * Deletes the directory.
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param recursiveDirectoryDelete If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
+     * @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<DirectorysDeleteResponse> deleteWithRestResponseAsync(String filesystem, String path, boolean recursiveDirectoryDelete, Context context) {
+        final Integer timeout = null;
+        final String marker = null;
+        final String requestId = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        return service.delete(filesystem, path, this.client.getUrl(), timeout, recursiveDirectoryDelete, marker, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+
+    /**
+     * Deletes the directory.
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param recursiveDirectoryDelete If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param marker When renaming a directory, the number of paths that are renamed with each invocation is limited.  If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header.  When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory.
+     * @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 leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @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<DirectorysDeleteResponse> deleteWithRestResponseAsync(String filesystem, String path, boolean recursiveDirectoryDelete, Integer timeout, String marker, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        return service.delete(filesystem, path, this.client.getUrl(), timeout, recursiveDirectoryDelete, marker, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
index 97dd44b22bc5..2b171b31339e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
@@ -22,6 +22,7 @@
 import com.azure.core.implementation.util.Base64Util;
 import com.azure.core.util.Context;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
@@ -80,12 +81,12 @@ private interface PageBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<PageBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-blob-content-length") long blobContentLength, @HeaderParam("x-ms-blob-sequence-number") Long blobSequenceNumber, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<PageBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-blob-content-length") long blobContentLength, @HeaderParam("x-ms-blob-sequence-number") Long blobSequenceNumber, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<PageBlobsUploadPagesResponse> uploadPages(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<PageBlobsUploadPagesResponse> uploadPages(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
@@ -95,7 +96,7 @@ private interface PageBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("Content-Length") long contentLength, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @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-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+        Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("x-ms-source-content-crc64") String sourceContentcrc64, @HeaderParam("Content-Length") long contentLength, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @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-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
 
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200})
@@ -138,9 +139,10 @@ private interface PageBlobsService {
     public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, long blobContentLength, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final Long blobSequenceNumber = 0L;
         final String requestId = null;
         final String blobType = "PageBlob";
@@ -150,12 +152,13 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
         final String blobCacheControl = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -167,20 +170,22 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
      * @param blobContentLength This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param blobSequenceNumber Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1.
      * @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 blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<PageBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, long blobContentLength, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, Long blobSequenceNumber, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, long blobContentLength, Integer timeout, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, Long blobSequenceNumber, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String blobType = "PageBlob";
         String blobContentType = null;
         if (blobHTTPHeaders != null) {
@@ -210,6 +215,10 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -229,7 +238,7 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -247,22 +256,24 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
     public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Context context) {
         final Integer timeout = null;
         final String range = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "page";
         final String pageWrite = "update";
         final String leaseId = null;
+        final String encryptionScope = null;
         final Long ifSequenceNumberLessThanOrEqualTo = null;
         final Long ifSequenceNumberLessThan = null;
         final Long ifSequenceNumberEqualTo = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, timeout, range, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, timeout, range, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, encryptionScope, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -273,13 +284,15 @@ public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(Strin
      * @param body Initial data.
      * @param contentLength The length of the request.
      * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param range Return only the bytes of the blob in the specified range.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @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 leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param sequenceNumberAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @param context The context to associate with this operation.
@@ -287,13 +300,17 @@ public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(Strin
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, byte[] transactionalContentMD5, Integer timeout, String range, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, Integer timeout, String range, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "page";
         final String pageWrite = "update";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         Long ifSequenceNumberLessThanOrEqualTo = null;
         if (sequenceNumberAccessConditions != null) {
             ifSequenceNumberLessThanOrEqualTo = sequenceNumberAccessConditions.ifSequenceNumberLessThanOrEqualTo();
@@ -323,9 +340,10 @@ public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(Strin
             ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
         }
         String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, timeout, range, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, timeout, range, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, encryptionScope, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -441,11 +459,12 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
         String sourceContentMD5Converted = null;
+        String sourceContentcrc64Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
-        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -458,6 +477,7 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
      * @param contentLength The length of the request.
      * @param range The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required.
      * @param sourceContentMD5 Specify the md5 calculated for the range of bytes that must be read from the copy source.
+     * @param sourceContentcrc64 Specify the crc64 calculated for the range of bytes that must be read from the copy source.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @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 leaseAccessConditions Additional parameters for the operation.
@@ -469,7 +489,7 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestResponseAsync(String containerName, String blob, URL sourceUrl, String sourceRange, long contentLength, String range, byte[] sourceContentMD5, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+    public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestResponseAsync(String containerName, String blob, URL sourceUrl, String sourceRange, long contentLength, String range, byte[] sourceContentMD5, byte[] sourceContentcrc64, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
         final String comp = "page";
         final String pageWrite = "update";
         String leaseId = null;
@@ -521,11 +541,12 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
             sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
         }
         String sourceContentMD5Converted = Base64Util.encodeToString(sourceContentMD5);
+        String sourceContentcrc64Converted = Base64Util.encodeToString(sourceContentcrc64);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
         DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
-        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java
index 5d77ec9bcee0..c3cddbd66fa2 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.util.Context;
 import com.azure.storage.blob.models.KeyInfo;
 import com.azure.storage.blob.models.ListContainersIncludeType;
+import com.azure.storage.blob.models.ServicesFilterBlobsResponse;
 import com.azure.storage.blob.models.ServicesGetAccountInfoResponse;
 import com.azure.storage.blob.models.ServicesGetPropertiesResponse;
 import com.azure.storage.blob.models.ServicesGetStatisticsResponse;
@@ -81,7 +82,7 @@ private interface ServicesService {
         @Get("")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ServicesListContainersSegmentResponse> 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, Context context);
+        Mono<ServicesListContainersSegmentResponse> listContainersSegment(@HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("marker") String marker1, @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, Context context);
 
         @Post("")
         @ExpectedResponses({200})
@@ -92,6 +93,11 @@ private interface ServicesService {
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
         Mono<ServicesGetAccountInfoResponse> getAccountInfo(@HostParam("url") String url, @HeaderParam("x-ms-version") String version, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
+
+        @Get("")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<ServicesFilterBlobsResponse> filterBlobs(@HostParam("url") String url, @QueryParam("marker") String marker1, @QueryParam("maxresults") Integer maxresults, @QueryParam("filter") String filter, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
     }
 
     /**
@@ -277,4 +283,38 @@ public Mono<ServicesGetAccountInfoResponse> getAccountInfoWithRestResponseAsync(
         final String comp = "properties";
         return service.getAccountInfo(this.client.getUrl(), this.client.getVersion(), restype, comp, context);
     }
+
+    /**
+     * The Filter Blobs operation enables callers to list blobs in an account whose tags match a given search expression.
+     *
+     * @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<ServicesFilterBlobsResponse> filterBlobsWithRestResponseAsync(Context context) {
+        final String marker = null;
+        final Integer maxresults = null;
+        final Integer timeout = null;
+        final String requestId = null;
+        final String comp = "blobs";
+        return service.filterBlobs(this.client.getUrl(), marker, maxresults, this.client.getFilter(), timeout, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Filter Blobs operation enables callers to list blobs in an account whose tags match a given search expression.
+     *
+     * @param marker A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.
+     * @param maxresults Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @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 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<ServicesFilterBlobsResponse> filterBlobsWithRestResponseAsync(String marker, Integer maxresults, Integer timeout, String requestId, Context context) {
+        final String comp = "blobs";
+        return service.filterBlobs(this.client.getUrl(), marker, maxresults, this.client.getFilter(), timeout, this.client.getVersion(), requestId, comp, context);
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java
new file mode 100644
index 000000000000..55a3a7703d98
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java
@@ -0,0 +1,47 @@
+// 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.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/**
+ * Defines values for AccessTierOptional.
+ */
+public final class AccessTierOptional extends ExpandableStringEnum<AccessTierOptional> {
+    /**
+     * Static value Hot for AccessTierOptional.
+     */
+    public static final AccessTierOptional HOT = fromString("Hot");
+
+    /**
+     * Static value Cool for AccessTierOptional.
+     */
+    public static final AccessTierOptional COOL = fromString("Cool");
+
+    /**
+     * Static value Archive for AccessTierOptional.
+     */
+    public static final AccessTierOptional ARCHIVE = fromString("Archive");
+
+    /**
+     * Creates or finds a AccessTierOptional from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding AccessTierOptional.
+     */
+    @JsonCreator
+    public static AccessTierOptional fromString(String name) {
+        return fromString(name, AccessTierOptional.class);
+    }
+
+    /**
+     * @return known AccessTierOptional values.
+     */
+    public static Collection<AccessTierOptional> values() {
+        return values(AccessTierOptional.class);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java
new file mode 100644
index 000000000000..821302c1cd83
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java
@@ -0,0 +1,82 @@
+// 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.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/**
+ * Defines values for AccessTierRequired.
+ */
+public final class AccessTierRequired extends ExpandableStringEnum<AccessTierRequired> {
+    /**
+     * Static value P4 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P4 = fromString("P4");
+
+    /**
+     * Static value P6 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P6 = fromString("P6");
+
+    /**
+     * Static value P10 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P10 = fromString("P10");
+
+    /**
+     * Static value P20 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P20 = fromString("P20");
+
+    /**
+     * Static value P30 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P30 = fromString("P30");
+
+    /**
+     * Static value P40 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P40 = fromString("P40");
+
+    /**
+     * Static value P50 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P50 = fromString("P50");
+
+    /**
+     * Static value Hot for AccessTierRequired.
+     */
+    public static final AccessTierRequired HOT = fromString("Hot");
+
+    /**
+     * Static value Cool for AccessTierRequired.
+     */
+    public static final AccessTierRequired COOL = fromString("Cool");
+
+    /**
+     * Static value Archive for AccessTierRequired.
+     */
+    public static final AccessTierRequired ARCHIVE = fromString("Archive");
+
+    /**
+     * Creates or finds a AccessTierRequired from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding AccessTierRequired.
+     */
+    @JsonCreator
+    public static AccessTierRequired fromString(String name) {
+        return fromString(name, AccessTierRequired.class);
+    }
+
+    /**
+     * @return known AccessTierRequired values.
+     */
+    public static Collection<AccessTierRequired> values() {
+        return values(AccessTierRequired.class);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java
index 8dcea49cd76c..509acba0c155 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java
@@ -41,6 +41,14 @@ public final class AppendBlobAppendBlockFromUrlHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -164,6 +172,32 @@ public AppendBlobAppendBlockFromUrlHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the AppendBlobAppendBlockFromUrlHeaders object itself.
+     */
+    public AppendBlobAppendBlockFromUrlHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java
index a12cefa924e6..61d2450a114d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java
@@ -41,6 +41,21 @@ public final class AppendBlobAppendBlockHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -93,6 +108,14 @@ public final class AppendBlobAppendBlockHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the block. This header is only
+     * returned when the block was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -180,6 +203,56 @@ public AppendBlobAppendBlockHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the AppendBlobAppendBlockHeaders object itself.
+     */
+    public AppendBlobAppendBlockHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the AppendBlobAppendBlockHeaders object itself.
+     */
+    public AppendBlobAppendBlockHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -349,6 +422,30 @@ public AppendBlobAppendBlockHeaders encryptionKeySha256(String encryptionKeySha2
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the AppendBlobAppendBlockHeaders object itself.
+     */
+    public AppendBlobAppendBlockHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java
index c2e5a3e0929e..77af78187b8e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java
@@ -41,6 +41,13 @@ public final class AppendBlobCreateHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +94,13 @@ public final class AppendBlobCreateHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -174,6 +188,30 @@ public AppendBlobCreateHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the AppendBlobCreateHeaders object itself.
+     */
+    public AppendBlobCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +359,30 @@ public AppendBlobCreateHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the AppendBlobCreateHeaders object itself.
+     */
+    public AppendBlobCreateHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java
index c27f9fcac790..0dc5cbb43392 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-AbortCopyFromURL-Headers")
 @Fluent
 public final class BlobAbortCopyFromURLHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class BlobAbortCopyFromURLHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobAbortCopyFromURLHeaders object itself.
+     */
+    public BlobAbortCopyFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java
index d4649062bc60..0d986bc95d22 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class BlobAcquireLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public BlobAcquireLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobAcquireLeaseHeaders object itself.
+     */
+    public BlobAcquireLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java
index 504b7201befe..ba1ba989e108 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class BlobBreakLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-time")
     private Integer leaseTime;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -145,6 +152,30 @@ public BlobBreakLeaseHeaders leaseTime(Integer leaseTime) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobBreakLeaseHeaders object itself.
+     */
+    public BlobBreakLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java
index 67d6971d9ff3..e8ffbec32efd 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java
@@ -32,6 +32,13 @@ public final class BlobChangeLeaseHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -123,6 +130,30 @@ public BlobChangeLeaseHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobChangeLeaseHeaders object itself.
+     */
+    public BlobChangeLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java
index 140b771f8cd6..c584184a7a0c 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java
@@ -32,6 +32,13 @@ public final class BlobCopyFromURLHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -138,6 +145,30 @@ public BlobCopyFromURLHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobCopyFromURLHeaders object itself.
+     */
+    public BlobCopyFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java
index e27c4fde4964..7d4778cd49df 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java
@@ -39,6 +39,13 @@ public final class BlobCreateSnapshotHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -86,6 +93,14 @@ public final class BlobCreateSnapshotHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the source blob. This header is
+     * only returned when the blob was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -173,6 +188,30 @@ public BlobCreateSnapshotHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobCreateSnapshotHeaders object itself.
+     */
+    public BlobCreateSnapshotHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -324,6 +363,30 @@ public BlobCreateSnapshotHeaders encryptionKeySha256(String encryptionKeySha256)
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the source blob. This header is only returned when the blob was
+     * encrypted with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the source blob. This header is only returned when the blob was
+     * encrypted with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobCreateSnapshotHeaders object itself.
+     */
+    public BlobCreateSnapshotHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java
index 95e6289c3e40..0e4c48ffc536 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-Delete-Headers")
 @Fluent
 public final class BlobDeleteHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class BlobDeleteHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobDeleteHeaders object itself.
+     */
+    public BlobDeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
index 4e9e2997ebab..255b428f1e8e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
@@ -196,6 +196,13 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "x-ms-lease-status")
     private LeaseStatusType leaseStatus;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -248,6 +255,13 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * If the blob has a MD5 hash, and if request contains range header (Range
      * or x-ms-range), this response header is returned with the value of the
@@ -258,6 +272,22 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "x-ms-blob-content-md5")
     private byte[] blobContentMD5;
 
+    /*
+     * The number of tags corresponding to the blob.
+     */
+    @JsonProperty(value = "x-ms-tag-count")
+    private Integer tagCount;
+
+    /*
+     * If the request is to read a specified range and the
+     * x-ms-range-get-content-crc64 is set to true, then the request returns a
+     * crc64 for the range, as long as the range size is less than or equal to
+     * 4 MB. If both x-ms-range-get-content-crc64 & x-ms-range-get-content-md5
+     * is specified in the same request, it will fail with 400(Bad Request)
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] contentCrc64;
+
     /*
      * The errorCode property.
      */
@@ -824,6 +854,30 @@ public BlobDownloadHeaders leaseStatus(LeaseStatusType leaseStatus) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -995,6 +1049,30 @@ public BlobDownloadHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the blobContentMD5 property: If the blob has a MD5 hash, and if
      * request contains range header (Range or x-ms-range), this response
@@ -1023,6 +1101,56 @@ public BlobDownloadHeaders blobContentMD5(byte[] blobContentMD5) {
         return this;
     }
 
+    /**
+     * Get the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @return the tagCount value.
+     */
+    public Integer tagCount() {
+        return this.tagCount;
+    }
+
+    /**
+     * Set the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @param tagCount the tagCount value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders tagCount(Integer tagCount) {
+        this.tagCount = tagCount;
+        return this;
+    }
+
+    /**
+     * Get the contentCrc64 property: If the request is to read a specified
+     * range and the x-ms-range-get-content-crc64 is set to true, then the
+     * request returns a crc64 for the range, as long as the range size is less
+     * than or equal to 4 MB. If both x-ms-range-get-content-crc64 &amp;
+     * x-ms-range-get-content-md5 is specified in the same request, it will
+     * fail with 400(Bad Request).
+     *
+     * @return the contentCrc64 value.
+     */
+    public byte[] contentCrc64() {
+        return ImplUtils.clone(this.contentCrc64);
+    }
+
+    /**
+     * Set the contentCrc64 property: If the request is to read a specified
+     * range and the x-ms-range-get-content-crc64 is set to true, then the
+     * request returns a crc64 for the range, as long as the range size is less
+     * than or equal to 4 MB. If both x-ms-range-get-content-crc64 &amp;
+     * x-ms-range-get-content-md5 is specified in the same request, it will
+     * fail with 400(Bad Request).
+     *
+     * @param contentCrc64 the contentCrc64 value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders contentCrc64(byte[] contentCrc64) {
+        this.contentCrc64 = ImplUtils.clone(contentCrc64);
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java
index 21243aaac732..61acd7944cc9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-GetAccountInfo-Headers")
 @Fluent
 public final class BlobGetAccountInfoHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -59,6 +66,30 @@ public final class BlobGetAccountInfoHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobGetAccountInfoHeaders object itself.
+     */
+    public BlobGetAccountInfoHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java
index 728ae5fd9e1e..a09003611a5f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java
@@ -209,6 +209,13 @@ public final class BlobGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -261,6 +268,14 @@ public final class BlobGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the metadata. This header is only
+     * returned when the metadata was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The tier of page blob on a premium storage account or tier of block blob
      * on blob storage LRS accounts. For a list of allowed premium page blob
@@ -295,6 +310,12 @@ public final class BlobGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-access-tier-change-time")
     private DateTimeRfc1123 accessTierChangeTime;
 
+    /*
+     * The number of tags corresponding to the blob.
+     */
+    @JsonProperty(value = "x-ms-tag-count")
+    private Integer tagCount;
+
     /*
      * The errorCode property.
      */
@@ -914,6 +935,30 @@ public BlobGetPropertiesHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobGetPropertiesHeaders object itself.
+     */
+    public BlobGetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -1085,6 +1130,30 @@ public BlobGetPropertiesHeaders encryptionKeySha256(String encryptionKeySha256)
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the metadata was
+     * encrypted with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the metadata was
+     * encrypted with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobGetPropertiesHeaders object itself.
+     */
+    public BlobGetPropertiesHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the accessTier property: The tier of page blob on a premium storage
      * account or tier of block blob on blob storage LRS accounts. For a list
@@ -1198,6 +1267,26 @@ public BlobGetPropertiesHeaders accessTierChangeTime(OffsetDateTime accessTierCh
         return this;
     }
 
+    /**
+     * Get the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @return the tagCount value.
+     */
+    public Integer tagCount() {
+        return this.tagCount;
+    }
+
+    /**
+     * Set the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @param tagCount the tagCount value to set.
+     * @return the BlobGetPropertiesHeaders object itself.
+     */
+    public BlobGetPropertiesHeaders tagCount(Integer tagCount) {
+        this.tagCount = tagCount;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetTagsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetTagsHeaders.java
new file mode 100644
index 000000000000..62de1e897127
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetTagsHeaders.java
@@ -0,0 +1,172 @@
+// 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.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for GetTags operation.
+ */
+@JacksonXmlRootElement(localName = "Blob-GetTags-Headers")
+@Fluent
+public final class BlobGetTagsHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * 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 dateProperty;
+
+    /*
+     * The errorCode property.
+     */
+    @JsonProperty(value = "x-ms-error-code")
+    private String errorCode;
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @param requestId the requestId value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: 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.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: 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.
+     *
+     * @param version the version value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+
+    /**
+     * Get the errorCode property: The errorCode property.
+     *
+     * @return the errorCode value.
+     */
+    public String errorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * Set the errorCode property: The errorCode property.
+     *
+     * @param errorCode the errorCode value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders errorCode(String errorCode) {
+        this.errorCode = errorCode;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
index 3d777a4b2e38..41b8d278c7e4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
@@ -51,6 +51,12 @@ public final class BlobItem {
     @JsonProperty(value = "Metadata")
     private Map<String, String> metadata;
 
+    /*
+     * The tags property.
+     */
+    @JsonProperty(value = "Tags")
+    private BlobTags tags;
+
     /*
      * The isPrefix property.
      */
@@ -177,6 +183,26 @@ public BlobItem metadata(Map<String, String> metadata) {
         return this;
     }
 
+    /**
+     * Get the tags property: The tags property.
+     *
+     * @return the tags value.
+     */
+    public BlobTags tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: The tags property.
+     *
+     * @param tags the tags value to set.
+     * @return the BlobItem object itself.
+     */
+    public BlobItem tags(BlobTags tags) {
+        this.tags = tags;
+        return this;
+    }
+
     /**
      * Get the isPrefix property: The isPrefix property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
index d5bad7b9996e..0438f3f441f6 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
@@ -200,12 +200,24 @@ public final class BlobProperties {
     @JsonProperty(value = "CustomerProvidedKeySha256")
     private String customerProvidedKeySha256;
 
+    /*
+     * The encryptionScope property.
+     */
+    @JsonProperty(value = "EncryptionScope")
+    private String encryptionScope;
+
     /*
      * The accessTierChangeTime property.
      */
     @JsonProperty(value = "AccessTierChangeTime")
     private DateTimeRfc1123 accessTierChangeTime;
 
+    /*
+     * The number of tags corresponding to the blob.
+     */
+    @JsonProperty(value = "TagCount", required = true)
+    private int tagCount;
+
     /**
      * Get the creationTime property: The creationTime property.
      *
@@ -855,6 +867,26 @@ public BlobProperties customerProvidedKeySha256(String customerProvidedKeySha256
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryptionScope property.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryptionScope property.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobProperties object itself.
+     */
+    public BlobProperties encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the accessTierChangeTime property: The accessTierChangeTime
      * property.
@@ -883,4 +915,24 @@ public BlobProperties accessTierChangeTime(OffsetDateTime accessTierChangeTime)
         }
         return this;
     }
+
+    /**
+     * Get the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @return the tagCount value.
+     */
+    public int tagCount() {
+        return this.tagCount;
+    }
+
+    /**
+     * Set the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @param tagCount the tagCount value to set.
+     * @return the BlobProperties object itself.
+     */
+    public BlobProperties tagCount(int tagCount) {
+        this.tagCount = tagCount;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java
index f503b9ab6d30..d90443f43ec1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java
@@ -32,6 +32,13 @@ public final class BlobReleaseLeaseHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public BlobReleaseLeaseHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobReleaseLeaseHeaders object itself.
+     */
+    public BlobReleaseLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenameHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenameHeaders.java
new file mode 100644
index 000000000000..7c293db887cd
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenameHeaders.java
@@ -0,0 +1,234 @@
+// 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.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Rename operation.
+ */
+@JacksonXmlRootElement(localName = "Blob-Rename-Headers")
+@Fluent
+public final class BlobRenameHeaders {
+    /*
+     * An HTTP entity tag associated with the file or directory.
+     */
+    @JsonProperty(value = "ETag")
+    private String eTag;
+
+    /*
+     * The data and time the file or directory was last modified.  Write
+     * operations on the file or directory update the last modified time.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * The size of the resource in bytes.
+     */
+    @JsonProperty(value = "Content-Length")
+    private Long contentLength;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @return the eTag value.
+     */
+    public String eTag() {
+        return this.eTag;
+    }
+
+    /**
+     * Set the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @param eTag the eTag value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders eTag(String eTag) {
+        this.eTag = eTag;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The data and time the file or directory
+     * was last modified.  Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime lastModified() {
+        if (this.lastModified == null) {
+            return null;
+        }
+        return this.lastModified.dateTime();
+    }
+
+    /**
+     * Set the lastModified property: The data and time the file or directory
+     * was last modified.  Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @param lastModified the lastModified value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders lastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
+        } else {
+            this.lastModified = new DateTimeRfc1123(lastModified);
+        }
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the contentLength property: The size of the resource in bytes.
+     *
+     * @return the contentLength value.
+     */
+    public Long contentLength() {
+        return this.contentLength;
+    }
+
+    /**
+     * Set the contentLength property: The size of the resource in bytes.
+     *
+     * @param contentLength the contentLength value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders contentLength(Long contentLength) {
+        this.contentLength = contentLength;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java
index 863157cf8a42..f7115f510628 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class BlobRenewLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public BlobRenewLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobRenewLeaseHeaders object itself.
+     */
+    public BlobRenewLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java
index ed539d644bc1..b926fb245980 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java
@@ -39,6 +39,13 @@ public final class BlobSetHTTPHeadersHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -146,6 +153,30 @@ public BlobSetHTTPHeadersHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetHTTPHeadersHeaders object itself.
+     */
+    public BlobSetHTTPHeadersHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java
index 5b3898194287..56704d9b8419 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java
@@ -32,6 +32,13 @@ public final class BlobSetMetadataHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -70,6 +77,14 @@ public final class BlobSetMetadataHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the metadata. This header is only
+     * returned when the when the metadata was with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -133,6 +148,30 @@ public BlobSetMetadataHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetMetadataHeaders object itself.
+     */
+    public BlobSetMetadataHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -256,6 +295,30 @@ public BlobSetMetadataHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the when the metadata
+     * was with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the when the metadata
+     * was with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobSetMetadataHeaders object itself.
+     */
+    public BlobSetMetadataHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTagsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTagsHeaders.java
new file mode 100644
index 000000000000..58da7c6edbfb
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTagsHeaders.java
@@ -0,0 +1,172 @@
+// 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.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for SetTags operation.
+ */
+@JacksonXmlRootElement(localName = "Blob-SetTags-Headers")
+@Fluent
+public final class BlobSetTagsHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * 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 dateProperty;
+
+    /*
+     * The errorCode property.
+     */
+    @JsonProperty(value = "x-ms-error-code")
+    private String errorCode;
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @param requestId the requestId value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: 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.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: 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.
+     *
+     * @param version the version value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+
+    /**
+     * Get the errorCode property: The errorCode property.
+     *
+     * @return the errorCode value.
+     */
+    public String errorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * Set the errorCode property: The errorCode property.
+     *
+     * @param errorCode the errorCode value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders errorCode(String errorCode) {
+        this.errorCode = errorCode;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java
index 372b1a09ebc0..0ec7d69471c5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Blob-SetTier-Headers")
 @Fluent
 public final class BlobSetTierHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class BlobSetTierHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetTierHeaders object itself.
+     */
+    public BlobSetTierHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java
index a6b195a6e6dc..f625c74b5250 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java
@@ -32,6 +32,13 @@ public final class BlobStartCopyFromURLHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -140,6 +147,30 @@ public BlobStartCopyFromURLHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobStartCopyFromURLHeaders object itself.
+     */
+    public BlobStartCopyFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobTags.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobTags.java
new file mode 100644
index 000000000000..511b4202d2b6
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobTags.java
@@ -0,0 +1,59 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * XML containing key/value pairs representing the tags for the blob.
+ */
+@JacksonXmlRootElement(localName = "Tags")
+@Fluent
+public final class BlobTags {
+    private static final class TagSetWrapper {
+        @JacksonXmlProperty(localName = "Tag")
+        private final List<Tag> items;
+
+        @JsonCreator
+        private TagSetWrapper(@JacksonXmlProperty(localName = "Tag") List<Tag> items) {
+            this.items = items;
+        }
+    }
+
+    /*
+     * The tagSet property.
+     */
+    @JsonProperty(value = "TagSet")
+    private TagSetWrapper tagSet;
+
+    /**
+     * Get the tagSet property: The tagSet property.
+     *
+     * @return the tagSet value.
+     */
+    public List<Tag> tagSet() {
+        if (this.tagSet == null) {
+            this.tagSet = new TagSetWrapper(new ArrayList<Tag>());
+        }
+        return this.tagSet.items;
+    }
+
+    /**
+     * Set the tagSet property: The tagSet property.
+     *
+     * @param tagSet the tagSet value to set.
+     * @return the BlobTags object itself.
+     */
+    public BlobTags tagSet(List<Tag> tagSet) {
+        this.tagSet = new TagSetWrapper(tagSet);
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java
index cd1ea6a55d13..3b11e7dd6632 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-Undelete-Headers")
 @Fluent
 public final class BlobUndeleteHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class BlobUndeleteHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobUndeleteHeaders object itself.
+     */
+    public BlobUndeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsGetTagsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsGetTagsResponse.java
new file mode 100644
index 000000000000..e97f1ca848f5
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsGetTagsResponse.java
@@ -0,0 +1,35 @@
+// 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.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the getTags operation.
+ */
+public final class BlobsGetTagsResponse extends ResponseBase<BlobGetTagsHeaders, BlobTags> {
+    /**
+     * Creates an instance of BlobsGetTagsResponse.
+     *
+     * @param request the request which resulted in this BlobsGetTagsResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsGetTagsResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, BlobTags value, BlobGetTagsHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+
+    /**
+     * @return the deserialized response body.
+     */
+    @Override
+    public BlobTags value() {
+        return super.value();
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsRenameResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsRenameResponse.java
new file mode 100644
index 000000000000..1be4db789caa
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsRenameResponse.java
@@ -0,0 +1,27 @@
+// 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.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the rename operation.
+ */
+public final class BlobsRenameResponse extends ResponseBase<BlobRenameHeaders, Void> {
+    /**
+     * Creates an instance of BlobsRenameResponse.
+     *
+     * @param request the request which resulted in this BlobsRenameResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsRenameResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, BlobRenameHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsSetTagsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsSetTagsResponse.java
new file mode 100644
index 000000000000..58946c96cbb3
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsSetTagsResponse.java
@@ -0,0 +1,27 @@
+// 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.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the setTags operation.
+ */
+public final class BlobsSetTagsResponse extends ResponseBase<BlobSetTagsHeaders, Void> {
+    /**
+     * Creates an instance of BlobsSetTagsResponse.
+     *
+     * @param request the request which resulted in this BlobsSetTagsResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsSetTagsResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, BlobSetTagsHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java
index 6bec949d7180..0b2f37e8bc76 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java
@@ -34,13 +34,28 @@ public final class BlockBlobCommitBlockListHeaders {
     private DateTimeRfc1123 lastModified;
 
     /*
-     * If the blob has an MD5 hash and this operation is to read the full blob,
-     * this response header is returned so that the client can check for
-     * message content integrity.
+     * This header is returned so that the client can check for message content
+     * integrity. This header refers to the content of the request, meaning, in
+     * this case, the list of blocks, and not the content of the blob itself.
      */
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. This header refers to the content of the request, meaning, in
+     * this case, the list of blocks, and not the content of the blob itself.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +102,13 @@ public final class BlockBlobCommitBlockListHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -151,9 +173,10 @@ public BlockBlobCommitBlockListHeaders lastModified(OffsetDateTime lastModified)
     }
 
     /**
-     * Get the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Get the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. This header refers to the
+     * content of the request, meaning, in this case, the list of blocks, and
+     * not the content of the blob itself.
      *
      * @return the contentMD5 value.
      */
@@ -162,9 +185,10 @@ public byte[] contentMD5() {
     }
 
     /**
-     * Set the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Set the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. This header refers to the
+     * content of the request, meaning, in this case, the list of blocks, and
+     * not the content of the blob itself.
      *
      * @param contentMD5 the contentMD5 value to set.
      * @return the BlockBlobCommitBlockListHeaders object itself.
@@ -174,6 +198,56 @@ public BlockBlobCommitBlockListHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. This header refers to
+     * the content of the request, meaning, in this case, the list of blocks,
+     * and not the content of the blob itself.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. This header refers to
+     * the content of the request, meaning, in this case, the list of blocks,
+     * and not the content of the blob itself.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the BlockBlobCommitBlockListHeaders object itself.
+     */
+    public BlockBlobCommitBlockListHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobCommitBlockListHeaders object itself.
+     */
+    public BlockBlobCommitBlockListHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +395,30 @@ public BlockBlobCommitBlockListHeaders encryptionKeySha256(String encryptionKeyS
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobCommitBlockListHeaders object itself.
+     */
+    public BlockBlobCommitBlockListHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java
index fa50d846ebef..102d7229c0f1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java
@@ -45,6 +45,13 @@ public final class BlockBlobGetBlockListHeaders {
     @JsonProperty(value = "x-ms-blob-content-length")
     private Long blobContentLength;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -172,6 +179,30 @@ public BlockBlobGetBlockListHeaders blobContentLength(Long blobContentLength) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobGetBlockListHeaders object itself.
+     */
+    public BlockBlobGetBlockListHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java
index 88dd3c6346ed..bc26268bf092 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java
@@ -18,13 +18,28 @@
 @Fluent
 public final class BlockBlobStageBlockFromURLHeaders {
     /*
-     * If the blob has an MD5 hash and this operation is to read the full blob,
-     * this response header is returned so that the client can check for
-     * message content integrity.
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
      */
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -63,6 +78,14 @@ public final class BlockBlobStageBlockFromURLHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the block. This header is only
+     * returned when the block was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -70,9 +93,10 @@ public final class BlockBlobStageBlockFromURLHeaders {
     private String errorCode;
 
     /**
-     * Get the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Get the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @return the contentMD5 value.
      */
@@ -81,9 +105,10 @@ public byte[] contentMD5() {
     }
 
     /**
-     * Set the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Set the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @param contentMD5 the contentMD5 value to set.
      * @return the BlockBlobStageBlockFromURLHeaders object itself.
@@ -93,6 +118,56 @@ public BlockBlobStageBlockFromURLHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the BlockBlobStageBlockFromURLHeaders object itself.
+     */
+    public BlockBlobStageBlockFromURLHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobStageBlockFromURLHeaders object itself.
+     */
+    public BlockBlobStageBlockFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -216,6 +291,30 @@ public BlockBlobStageBlockFromURLHeaders encryptionKeySha256(String encryptionKe
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobStageBlockFromURLHeaders object itself.
+     */
+    public BlockBlobStageBlockFromURLHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java
index 56ffdfe93700..862aab9c267f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java
@@ -18,13 +18,20 @@
 @Fluent
 public final class BlockBlobStageBlockHeaders {
     /*
-     * If the blob has an MD5 hash and this operation is to read the full blob,
-     * this response header is returned so that the client can check for
-     * message content integrity.
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
      */
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -47,6 +54,14 @@ public final class BlockBlobStageBlockHeaders {
     @JsonProperty(value = "Date")
     private DateTimeRfc1123 dateProperty;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The value of this header is set to true if the contents of the request
      * are successfully encrypted using the specified algorithm, and false
@@ -63,6 +78,14 @@ public final class BlockBlobStageBlockHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the block. This header is only
+     * returned when the block was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -70,9 +93,10 @@ public final class BlockBlobStageBlockHeaders {
     private String errorCode;
 
     /**
-     * Get the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Get the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @return the contentMD5 value.
      */
@@ -81,9 +105,10 @@ public byte[] contentMD5() {
     }
 
     /**
-     * Set the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Set the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @param contentMD5 the contentMD5 value to set.
      * @return the BlockBlobStageBlockHeaders object itself.
@@ -93,6 +118,30 @@ public BlockBlobStageBlockHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobStageBlockHeaders object itself.
+     */
+    public BlockBlobStageBlockHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -168,6 +217,32 @@ public BlockBlobStageBlockHeaders dateProperty(OffsetDateTime dateProperty) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the BlockBlobStageBlockHeaders object itself.
+     */
+    public BlockBlobStageBlockHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the isServerEncrypted property: The value of this header is set to
      * true if the contents of the request are successfully encrypted using the
@@ -216,6 +291,30 @@ public BlockBlobStageBlockHeaders encryptionKeySha256(String encryptionKeySha256
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobStageBlockHeaders object itself.
+     */
+    public BlockBlobStageBlockHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java
index 76c59b2f74d9..feaaeecfd96a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java
@@ -41,6 +41,13 @@ public final class BlockBlobUploadHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +94,13 @@ public final class BlockBlobUploadHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -174,6 +188,30 @@ public BlockBlobUploadHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobUploadHeaders object itself.
+     */
+    public BlockBlobUploadHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +359,30 @@ public BlockBlobUploadHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobUploadHeaders object itself.
+     */
+    public BlockBlobUploadHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java
index bd6d0580bdcf..15f4938ad8ee 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerAcquireLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public ContainerAcquireLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerAcquireLeaseHeaders object itself.
+     */
+    public ContainerAcquireLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java
index 4df2a5f3ddef..bea7906493fb 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerBreakLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-time")
     private Integer leaseTime;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -145,6 +152,30 @@ public ContainerBreakLeaseHeaders leaseTime(Integer leaseTime) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerBreakLeaseHeaders object itself.
+     */
+    public ContainerBreakLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java
index 8c5371a5121f..dd16b934a42a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerChangeLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public ContainerChangeLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerChangeLeaseHeaders object itself.
+     */
+    public ContainerChangeLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java
index 9a22e560ca72..c52bf1b9a1e5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerCreateHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerCreateHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerCreateHeaders object itself.
+     */
+    public ContainerCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java
index 64af976e0367..4308de71d186 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Container-Delete-Headers")
 @Fluent
 public final class ContainerDeleteHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class ContainerDeleteHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerDeleteHeaders object itself.
+     */
+    public ContainerDeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java
index a1a76b2f57ba..779ffb797e73 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java
@@ -39,6 +39,13 @@ public final class ContainerGetAccessPolicyHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -148,6 +155,30 @@ public ContainerGetAccessPolicyHeaders lastModified(OffsetDateTime lastModified)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerGetAccessPolicyHeaders object itself.
+     */
+    public ContainerGetAccessPolicyHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java
index 692c4a71fc52..368acb2e4cc4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Container-GetAccountInfo-Headers")
 @Fluent
 public final class ContainerGetAccountInfoHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -59,6 +66,30 @@ public final class ContainerGetAccountInfoHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerGetAccountInfoHeaders object itself.
+     */
+    public ContainerGetAccountInfoHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java
index df2d12bbcdb6..85b8d6b73077 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java
@@ -61,6 +61,13 @@ public final class ContainerGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-lease-status")
     private LeaseStatusType leaseStatus;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -90,6 +97,18 @@ public final class ContainerGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-blob-public-access")
     private PublicAccessType blobPublicAccess;
 
+    /*
+     * Default encryption scope on this container
+     */
+    @JsonProperty(value = "x-ms-default-encryption-scope")
+    private String defaultEncryptionScope;
+
+    /*
+     * Whether to reject the write request with encryption scope
+     */
+    @JsonProperty(value = "x-ms-deny-encryption-scope-override")
+    private Boolean denyEncryptionScopeOverride;
+
     /*
      * Indicates whether the container has an immutability policy set on it.
      */
@@ -253,6 +272,30 @@ public ContainerGetPropertiesHeaders leaseStatus(LeaseStatusType leaseStatus) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerGetPropertiesHeaders object itself.
+     */
+    public ContainerGetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -352,6 +395,51 @@ public ContainerGetPropertiesHeaders blobPublicAccess(PublicAccessType blobPubli
         return this;
     }
 
+    /**
+     * Get the defaultEncryptionScope property: Default encryption scope on
+     * this container.
+     *
+     * @return the defaultEncryptionScope value.
+     */
+    public String defaultEncryptionScope() {
+        return this.defaultEncryptionScope;
+    }
+
+    /**
+     * Set the defaultEncryptionScope property: Default encryption scope on
+     * this container.
+     *
+     * @param defaultEncryptionScope the defaultEncryptionScope value to set.
+     * @return the ContainerGetPropertiesHeaders object itself.
+     */
+    public ContainerGetPropertiesHeaders defaultEncryptionScope(String defaultEncryptionScope) {
+        this.defaultEncryptionScope = defaultEncryptionScope;
+        return this;
+    }
+
+    /**
+     * Get the denyEncryptionScopeOverride property: Whether to reject the
+     * write request with encryption scope.
+     *
+     * @return the denyEncryptionScopeOverride value.
+     */
+    public Boolean denyEncryptionScopeOverride() {
+        return this.denyEncryptionScopeOverride;
+    }
+
+    /**
+     * Set the denyEncryptionScopeOverride property: Whether to reject the
+     * write request with encryption scope.
+     *
+     * @param denyEncryptionScopeOverride the denyEncryptionScopeOverride value
+     * to set.
+     * @return the ContainerGetPropertiesHeaders object itself.
+     */
+    public ContainerGetPropertiesHeaders denyEncryptionScopeOverride(Boolean denyEncryptionScopeOverride) {
+        this.denyEncryptionScopeOverride = denyEncryptionScopeOverride;
+        return this;
+    }
+
     /**
      * Get the hasImmutabilityPolicy property: Indicates whether the container
      * has an immutability policy set on it.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java
index ef1252a5a8d4..a17ee04d84c1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java
@@ -23,6 +23,13 @@ public final class ContainerListBlobFlatSegmentHeaders {
     @JsonProperty(value = "Content-Type")
     private String contentType;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -73,6 +80,30 @@ public ContainerListBlobFlatSegmentHeaders contentType(String contentType) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerListBlobFlatSegmentHeaders object itself.
+     */
+    public ContainerListBlobFlatSegmentHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java
index d1a671cf7550..44bf89808b3a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java
@@ -23,6 +23,13 @@ public final class ContainerListBlobHierarchySegmentHeaders {
     @JsonProperty(value = "Content-Type")
     private String contentType;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -73,6 +80,30 @@ public ContainerListBlobHierarchySegmentHeaders contentType(String contentType)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerListBlobHierarchySegmentHeaders object itself.
+     */
+    public ContainerListBlobHierarchySegmentHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java
index 7a8766ab2424..0a33b2b26cbc 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerReleaseLeaseHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerReleaseLeaseHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerReleaseLeaseHeaders object itself.
+     */
+    public ContainerReleaseLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java
index a192e95a96c8..5fbbfb2a286b 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerRenewLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public ContainerRenewLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerRenewLeaseHeaders object itself.
+     */
+    public ContainerRenewLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java
index 763e75291800..a38fbf929c42 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerSetAccessPolicyHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerSetAccessPolicyHeaders lastModified(OffsetDateTime lastModified)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerSetAccessPolicyHeaders object itself.
+     */
+    public ContainerSetAccessPolicyHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java
index e685322b83ff..ee483bfdde40 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerSetMetadataHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerSetMetadataHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerSetMetadataHeaders object itself.
+     */
+    public ContainerSetMetadataHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/CustomerProvidedKeyInfo.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/CustomerProvidedKeyInfo.java
new file mode 100644
index 000000000000..3c033adb0ccc
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/CustomerProvidedKeyInfo.java
@@ -0,0 +1,51 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * Additional parameters for a set of operations.
+ */
+@JacksonXmlRootElement(localName = "customer-provided-key-info")
+@Fluent
+public final class CustomerProvidedKeyInfo {
+    /*
+     * Optional. Specifies the encryption scope to use to encrypt the data
+     * provided in the request. If not specified, encryption is performed with
+     * the root account encryption key.  For more information, see Encryption
+     * at Rest for Azure Storage Services.
+     */
+    @JsonProperty(value = "encryptionScope")
+    private String encryptionScope;
+
+    /**
+     * Get the encryptionScope property: Optional. Specifies the encryption
+     * scope to use to encrypt the data provided in the request. If not
+     * specified, encryption is performed with the root account encryption key.
+     * For more information, see Encryption at Rest for Azure Storage Services.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: Optional. Specifies the encryption
+     * scope to use to encrypt the data provided in the request. If not
+     * specified, encryption is performed with the root account encryption key.
+     * For more information, see Encryption at Rest for Azure Storage Services.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the CustomerProvidedKeyInfo object itself.
+     */
+    public CustomerProvidedKeyInfo encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageError.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageError.java
new file mode 100644
index 000000000000..d481a91fead8
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageError.java
@@ -0,0 +1,42 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * The DataLakeStorageError model.
+ */
+@JacksonXmlRootElement(localName = "DataLakeStorageError")
+@Fluent
+public final class DataLakeStorageError {
+    /*
+     * The service error response object.
+     */
+    @JsonProperty(value = "error")
+    private DataLakeStorageErrorError error;
+
+    /**
+     * Get the error property: The service error response object.
+     *
+     * @return the error value.
+     */
+    public DataLakeStorageErrorError error() {
+        return this.error;
+    }
+
+    /**
+     * Set the error property: The service error response object.
+     *
+     * @param error the error value to set.
+     * @return the DataLakeStorageError object itself.
+     */
+    public DataLakeStorageError error(DataLakeStorageErrorError error) {
+        this.error = error;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorError.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorError.java
new file mode 100644
index 000000000000..b9c43856709c
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorError.java
@@ -0,0 +1,68 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * The service error response object.
+ */
+@JacksonXmlRootElement(localName = "DataLakeStorageError_error")
+@Fluent
+public final class DataLakeStorageErrorError {
+    /*
+     * The service error code.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /*
+     * The service error message.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Get the code property: The service error code.
+     *
+     * @return the code value.
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Set the code property: The service error code.
+     *
+     * @param code the code value to set.
+     * @return the DataLakeStorageErrorError object itself.
+     */
+    public DataLakeStorageErrorError code(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get the message property: The service error message.
+     *
+     * @return the message value.
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set the message property: The service error message.
+     *
+     * @param message the message value to set.
+     * @return the DataLakeStorageErrorError object itself.
+     */
+    public DataLakeStorageErrorError message(String message) {
+        this.message = message;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorException.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorException.java
new file mode 100644
index 000000000000..da3d592a3e0d
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorException.java
@@ -0,0 +1,39 @@
+// 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.models;
+
+import com.azure.core.exception.HttpResponseException;
+import com.azure.core.http.HttpResponse;
+
+/**
+ * Exception thrown for an invalid response with DataLakeStorageError information.
+ */
+public final class DataLakeStorageErrorException extends HttpResponseException {
+    /**
+     * Initializes a new instance of the DataLakeStorageErrorException class.
+     *
+     * @param message the exception message or the response content if a message is not available.
+     * @param response the HTTP response.
+     */
+    public DataLakeStorageErrorException(String message, HttpResponse response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the DataLakeStorageErrorException class.
+     *
+     * @param message the exception message or the response content if a message is not available.
+     * @param response the HTTP response.
+     * @param value the deserialized response value.
+     */
+    public DataLakeStorageErrorException(String message, HttpResponse response, DataLakeStorageError value) {
+        super(message, response, value);
+    }
+
+    @Override
+    public DataLakeStorageError value() {
+        return (DataLakeStorageError) super.value();
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryCreateHeaders.java
new file mode 100644
index 000000000000..fc9f5eeaf9d2
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryCreateHeaders.java
@@ -0,0 +1,234 @@
+// 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.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Create operation.
+ */
+@JacksonXmlRootElement(localName = "Directory-Create-Headers")
+@Fluent
+public final class DirectoryCreateHeaders {
+    /*
+     * An HTTP entity tag associated with the file or directory.
+     */
+    @JsonProperty(value = "ETag")
+    private String eTag;
+
+    /*
+     * The data and time the file or directory was last modified. Write
+     * operations on the file or directory update the last modified time.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * The size of the resource in bytes.
+     */
+    @JsonProperty(value = "Content-Length")
+    private Long contentLength;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @return the eTag value.
+     */
+    public String eTag() {
+        return this.eTag;
+    }
+
+    /**
+     * Set the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @param eTag the eTag value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders eTag(String eTag) {
+        this.eTag = eTag;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime lastModified() {
+        if (this.lastModified == null) {
+            return null;
+        }
+        return this.lastModified.dateTime();
+    }
+
+    /**
+     * Set the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @param lastModified the lastModified value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders lastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
+        } else {
+            this.lastModified = new DateTimeRfc1123(lastModified);
+        }
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the contentLength property: The size of the resource in bytes.
+     *
+     * @return the contentLength value.
+     */
+    public Long contentLength() {
+        return this.contentLength;
+    }
+
+    /**
+     * Set the contentLength property: The size of the resource in bytes.
+     *
+     * @param contentLength the contentLength value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders contentLength(Long contentLength) {
+        this.contentLength = contentLength;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryDeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryDeleteHeaders.java
new file mode 100644
index 000000000000..921df9072945
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryDeleteHeaders.java
@@ -0,0 +1,183 @@
+// 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.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Delete operation.
+ */
+@JacksonXmlRootElement(localName = "Directory-Delete-Headers")
+@Fluent
+public final class DirectoryDeleteHeaders {
+    /*
+     * When renaming a directory, the number of paths that are renamed with
+     * each invocation is limited. If the number of paths to be renamed exceeds
+     * this limit, a continuation token is returned in this response header.
+     * When a continuation token is returned in the response, it must be
+     * specified in a subsequent invocation of the rename operation to continue
+     * renaming the directory.
+     */
+    @JsonProperty(value = "x-ms-continuation")
+    private String marker;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @return the marker value.
+     */
+    public String marker() {
+        return this.marker;
+    }
+
+    /**
+     * Set the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @param marker the marker value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders marker(String marker) {
+        this.marker = marker;
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryHttpHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryHttpHeaders.java
new file mode 100644
index 000000000000..ae0dd3997576
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryHttpHeaders.java
@@ -0,0 +1,149 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * Additional parameters for a set of operations, such as: Directorys_create,
+ * Directorys_rename, Blobs_rename.
+ */
+@JacksonXmlRootElement(localName = "directory-http-headers")
+@Fluent
+public final class DirectoryHttpHeaders {
+    /*
+     * Cache control for given resource
+     */
+    @JsonProperty(value = "cacheControl")
+    private String cacheControl;
+
+    /*
+     * Content type for given resource
+     */
+    @JsonProperty(value = "contentType")
+    private String contentType;
+
+    /*
+     * Content encoding for given resource
+     */
+    @JsonProperty(value = "contentEncoding")
+    private String contentEncoding;
+
+    /*
+     * Content language for given resource
+     */
+    @JsonProperty(value = "contentLanguage")
+    private String contentLanguage;
+
+    /*
+     * Content disposition for given resource
+     */
+    @JsonProperty(value = "contentDisposition")
+    private String contentDisposition;
+
+    /**
+     * Get the cacheControl property: Cache control for given resource.
+     *
+     * @return the cacheControl value.
+     */
+    public String cacheControl() {
+        return this.cacheControl;
+    }
+
+    /**
+     * Set the cacheControl property: Cache control for given resource.
+     *
+     * @param cacheControl the cacheControl value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders cacheControl(String cacheControl) {
+        this.cacheControl = cacheControl;
+        return this;
+    }
+
+    /**
+     * Get the contentType property: Content type for given resource.
+     *
+     * @return the contentType value.
+     */
+    public String contentType() {
+        return this.contentType;
+    }
+
+    /**
+     * Set the contentType property: Content type for given resource.
+     *
+     * @param contentType the contentType value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentType(String contentType) {
+        this.contentType = contentType;
+        return this;
+    }
+
+    /**
+     * Get the contentEncoding property: Content encoding for given resource.
+     *
+     * @return the contentEncoding value.
+     */
+    public String contentEncoding() {
+        return this.contentEncoding;
+    }
+
+    /**
+     * Set the contentEncoding property: Content encoding for given resource.
+     *
+     * @param contentEncoding the contentEncoding value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentEncoding(String contentEncoding) {
+        this.contentEncoding = contentEncoding;
+        return this;
+    }
+
+    /**
+     * Get the contentLanguage property: Content language for given resource.
+     *
+     * @return the contentLanguage value.
+     */
+    public String contentLanguage() {
+        return this.contentLanguage;
+    }
+
+    /**
+     * Set the contentLanguage property: Content language for given resource.
+     *
+     * @param contentLanguage the contentLanguage value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentLanguage(String contentLanguage) {
+        this.contentLanguage = contentLanguage;
+        return this;
+    }
+
+    /**
+     * Get the contentDisposition property: Content disposition for given
+     * resource.
+     *
+     * @return the contentDisposition value.
+     */
+    public String contentDisposition() {
+        return this.contentDisposition;
+    }
+
+    /**
+     * Set the contentDisposition property: Content disposition for given
+     * resource.
+     *
+     * @param contentDisposition the contentDisposition value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentDisposition(String contentDisposition) {
+        this.contentDisposition = contentDisposition;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryRenameHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryRenameHeaders.java
new file mode 100644
index 000000000000..365780542a9c
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryRenameHeaders.java
@@ -0,0 +1,275 @@
+// 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.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Rename operation.
+ */
+@JacksonXmlRootElement(localName = "Directory-Rename-Headers")
+@Fluent
+public final class DirectoryRenameHeaders {
+    /*
+     * When renaming a directory, the number of paths that are renamed with
+     * each invocation is limited. If the number of paths to be renamed exceeds
+     * this limit, a continuation token is returned in this response header.
+     * When a continuation token is returned in the response, it must be
+     * specified in a subsequent invocation of the rename operation to continue
+     * renaming the directory.
+     */
+    @JsonProperty(value = "x-ms-continuation")
+    private String marker;
+
+    /*
+     * An HTTP entity tag associated with the file or directory.
+     */
+    @JsonProperty(value = "ETag")
+    private String eTag;
+
+    /*
+     * The data and time the file or directory was last modified. Write
+     * operations on the file or directory update the last modified time.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * The size of the resource in bytes.
+     */
+    @JsonProperty(value = "Content-Length")
+    private Long contentLength;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @return the marker value.
+     */
+    public String marker() {
+        return this.marker;
+    }
+
+    /**
+     * Set the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @param marker the marker value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders marker(String marker) {
+        this.marker = marker;
+        return this;
+    }
+
+    /**
+     * Get the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @return the eTag value.
+     */
+    public String eTag() {
+        return this.eTag;
+    }
+
+    /**
+     * Set the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @param eTag the eTag value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders eTag(String eTag) {
+        this.eTag = eTag;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime lastModified() {
+        if (this.lastModified == null) {
+            return null;
+        }
+        return this.lastModified.dateTime();
+    }
+
+    /**
+     * Set the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @param lastModified the lastModified value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders lastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
+        } else {
+            this.lastModified = new DateTimeRfc1123(lastModified);
+        }
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the contentLength property: The size of the resource in bytes.
+     *
+     * @return the contentLength value.
+     */
+    public Long contentLength() {
+        return this.contentLength;
+    }
+
+    /**
+     * Set the contentLength property: The size of the resource in bytes.
+     *
+     * @param contentLength the contentLength value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders contentLength(Long contentLength) {
+        this.contentLength = contentLength;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysCreateResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysCreateResponse.java
new file mode 100644
index 000000000000..884c526dda38
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysCreateResponse.java
@@ -0,0 +1,27 @@
+// 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.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the create operation.
+ */
+public final class DirectorysCreateResponse extends ResponseBase<DirectoryCreateHeaders, Void> {
+    /**
+     * Creates an instance of DirectorysCreateResponse.
+     *
+     * @param request the request which resulted in this DirectorysCreateResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public DirectorysCreateResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, DirectoryCreateHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysDeleteResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysDeleteResponse.java
new file mode 100644
index 000000000000..6e3c9d532875
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysDeleteResponse.java
@@ -0,0 +1,27 @@
+// 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.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the delete operation.
+ */
+public final class DirectorysDeleteResponse extends ResponseBase<DirectoryDeleteHeaders, Void> {
+    /**
+     * Creates an instance of DirectorysDeleteResponse.
+     *
+     * @param request the request which resulted in this DirectorysDeleteResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public DirectorysDeleteResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, DirectoryDeleteHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysRenameResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysRenameResponse.java
new file mode 100644
index 000000000000..afea46a8180b
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysRenameResponse.java
@@ -0,0 +1,27 @@
+// 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.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the rename operation.
+ */
+public final class DirectorysRenameResponse extends ResponseBase<DirectoryRenameHeaders, Void> {
+    /**
+     * Creates an instance of DirectorysRenameResponse.
+     *
+     * @param request the request which resulted in this DirectorysRenameResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public DirectorysRenameResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, DirectoryRenameHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsItem.java
new file mode 100644
index 000000000000..477c3efb3f87
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsItem.java
@@ -0,0 +1,94 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * The FilterBlobsItem model.
+ */
+@JacksonXmlRootElement(localName = "Blob")
+@Fluent
+public final class FilterBlobsItem {
+    /*
+     * The name property.
+     */
+    @JsonProperty(value = "Name")
+    private String name;
+
+    /*
+     * The containerName property.
+     */
+    @JsonProperty(value = "ContainerName")
+    private String containerName;
+
+    /*
+     * The tagValue property.
+     */
+    @JsonProperty(value = "TagValue")
+    private String tagValue;
+
+    /**
+     * Get the name property: The name property.
+     *
+     * @return the name value.
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name property: The name property.
+     *
+     * @param name the name value to set.
+     * @return the FilterBlobsItem object itself.
+     */
+    public FilterBlobsItem name(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the containerName property: The containerName property.
+     *
+     * @return the containerName value.
+     */
+    public String containerName() {
+        return this.containerName;
+    }
+
+    /**
+     * Set the containerName property: The containerName property.
+     *
+     * @param containerName the containerName value to set.
+     * @return the FilterBlobsItem object itself.
+     */
+    public FilterBlobsItem containerName(String containerName) {
+        this.containerName = containerName;
+        return this;
+    }
+
+    /**
+     * Get the tagValue property: The tagValue property.
+     *
+     * @return the tagValue value.
+     */
+    public String tagValue() {
+        return this.tagValue;
+    }
+
+    /**
+     * Set the tagValue property: The tagValue property.
+     *
+     * @param tagValue the tagValue value to set.
+     * @return the FilterBlobsItem object itself.
+     */
+    public FilterBlobsItem tagValue(String tagValue) {
+        this.tagValue = tagValue;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsResponse.java
new file mode 100644
index 000000000000..df691b96b781
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsResponse.java
@@ -0,0 +1,173 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * An enumeration of blobs which matched the filter.
+ */
+@JacksonXmlRootElement(localName = "EnumerationResults")
+@Fluent
+public final class FilterBlobsResponse {
+    /*
+     * The serviceEndpoint property.
+     */
+    @JacksonXmlProperty(localName = "ServiceEndpoint", isAttribute = true)
+    private String serviceEndpoint;
+
+    /*
+     * The filter property.
+     */
+    @JsonProperty(value = "Filter", required = true)
+    private String filter;
+
+    /*
+     * The marker property.
+     */
+    @JsonProperty(value = "Marker")
+    private String marker;
+
+    /*
+     * The maxResults property.
+     */
+    @JsonProperty(value = "MaxResults")
+    private Integer maxResults;
+
+    /*
+     * The segment property.
+     */
+    @JsonProperty(value = "Blobs", required = true)
+    private FilterBlobsSegment segment;
+
+    /*
+     * The nextMarker property.
+     */
+    @JsonProperty(value = "NextMarker", required = true)
+    private String nextMarker;
+
+    /**
+     * Get the serviceEndpoint property: The serviceEndpoint property.
+     *
+     * @return the serviceEndpoint value.
+     */
+    public String serviceEndpoint() {
+        return this.serviceEndpoint;
+    }
+
+    /**
+     * Set the serviceEndpoint property: The serviceEndpoint property.
+     *
+     * @param serviceEndpoint the serviceEndpoint value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse serviceEndpoint(String serviceEndpoint) {
+        this.serviceEndpoint = serviceEndpoint;
+        return this;
+    }
+
+    /**
+     * Get the filter property: The filter property.
+     *
+     * @return the filter value.
+     */
+    public String filter() {
+        return this.filter;
+    }
+
+    /**
+     * Set the filter property: The filter property.
+     *
+     * @param filter the filter value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse filter(String filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /**
+     * Get the marker property: The marker property.
+     *
+     * @return the marker value.
+     */
+    public String marker() {
+        return this.marker;
+    }
+
+    /**
+     * Set the marker property: The marker property.
+     *
+     * @param marker the marker value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse marker(String marker) {
+        this.marker = marker;
+        return this;
+    }
+
+    /**
+     * Get the maxResults property: The maxResults property.
+     *
+     * @return the maxResults value.
+     */
+    public Integer maxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * Set the maxResults property: The maxResults property.
+     *
+     * @param maxResults the maxResults value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse maxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+        return this;
+    }
+
+    /**
+     * Get the segment property: The segment property.
+     *
+     * @return the segment value.
+     */
+    public FilterBlobsSegment segment() {
+        return this.segment;
+    }
+
+    /**
+     * Set the segment property: The segment property.
+     *
+     * @param segment the segment value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse segment(FilterBlobsSegment segment) {
+        this.segment = segment;
+        return this;
+    }
+
+    /**
+     * Get the nextMarker property: The nextMarker property.
+     *
+     * @return the nextMarker value.
+     */
+    public String nextMarker() {
+        return this.nextMarker;
+    }
+
+    /**
+     * Set the nextMarker property: The nextMarker property.
+     *
+     * @param nextMarker the nextMarker value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse nextMarker(String nextMarker) {
+        this.nextMarker = nextMarker;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsSegment.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsSegment.java
new file mode 100644
index 000000000000..c4daa8b128f6
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsSegment.java
@@ -0,0 +1,44 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The FilterBlobsSegment model.
+ */
+@JacksonXmlRootElement(localName = "Blobs")
+@Fluent
+public final class FilterBlobsSegment {
+    /*
+     * The blobItems property.
+     */
+    @JsonProperty("Blob")
+    private List<FilterBlobsItem> blobItems = new ArrayList<>();
+
+    /**
+     * Get the blobItems property: The blobItems property.
+     *
+     * @return the blobItems value.
+     */
+    public List<FilterBlobsItem> blobItems() {
+        return this.blobItems;
+    }
+
+    /**
+     * Set the blobItems property: The blobItems property.
+     *
+     * @param blobItems the blobItems value to set.
+     * @return the FilterBlobsSegment object itself.
+     */
+    public FilterBlobsSegment blobItems(List<FilterBlobsItem> blobItems) {
+        this.blobItems = blobItems;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
index 47ed4cbfd72f..6da8de210231 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
@@ -31,6 +31,11 @@ public enum ListBlobsIncludeItem {
      */
     SNAPSHOTS("snapshots"),
 
+    /**
+     * Enum value tags.
+     */
+    TAGS("tags"),
+
     /**
      * Enum value uncommittedblobs.
      */
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java
index 543c829bf271..c5c125eda749 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java
@@ -41,12 +41,27 @@ public final class PageBlobClearPagesHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The current sequence number for the page blob.
      */
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -156,6 +171,32 @@ public PageBlobClearPagesHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the PageBlobClearPagesHeaders object itself.
+     */
+    public PageBlobClearPagesHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the blobSequenceNumber property: The current sequence number for the
      * page blob.
@@ -178,6 +219,30 @@ public PageBlobClearPagesHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobClearPagesHeaders object itself.
+     */
+    public PageBlobClearPagesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java
index 7e9aa95c1ff3..2447b0c346b0 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java
@@ -32,6 +32,13 @@ public final class PageBlobCopyIncrementalHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -132,6 +139,30 @@ public PageBlobCopyIncrementalHeaders lastModified(OffsetDateTime lastModified)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobCopyIncrementalHeaders object itself.
+     */
+    public PageBlobCopyIncrementalHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java
index 6c4192fe4806..19b603ab7b6e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java
@@ -41,6 +41,13 @@ public final class PageBlobCreateHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +94,13 @@ public final class PageBlobCreateHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -174,6 +188,30 @@ public PageBlobCreateHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobCreateHeaders object itself.
+     */
+    public PageBlobCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +359,30 @@ public PageBlobCreateHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the PageBlobCreateHeaders object itself.
+     */
+    public PageBlobCreateHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java
index c1d14635bf44..da04c9aff1b9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java
@@ -38,6 +38,13 @@ public final class PageBlobGetPageRangesDiffHeaders {
     @JsonProperty(value = "x-ms-blob-content-length")
     private Long blobContentLength;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public PageBlobGetPageRangesDiffHeaders blobContentLength(Long blobContentLength
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobGetPageRangesDiffHeaders object itself.
+     */
+    public PageBlobGetPageRangesDiffHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java
index 32b37ef1452c..90a9a9add17d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java
@@ -38,6 +38,13 @@ public final class PageBlobGetPageRangesHeaders {
     @JsonProperty(value = "x-ms-blob-content-length")
     private Long blobContentLength;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public PageBlobGetPageRangesHeaders blobContentLength(Long blobContentLength) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobGetPageRangesHeaders object itself.
+     */
+    public PageBlobGetPageRangesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java
index e03c8720d2b6..43470469598d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java
@@ -39,6 +39,13 @@ public final class PageBlobResizeHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -146,6 +153,30 @@ public PageBlobResizeHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobResizeHeaders object itself.
+     */
+    public PageBlobResizeHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java
index 5f606b24c262..52a2b49532c9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java
@@ -39,6 +39,13 @@ public final class PageBlobUpdateSequenceNumberHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -146,6 +153,30 @@ public PageBlobUpdateSequenceNumberHeaders blobSequenceNumber(Long blobSequenceN
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobUpdateSequenceNumberHeaders object itself.
+     */
+    public PageBlobUpdateSequenceNumberHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java
index cebeb20842e3..d80a0eb276cd 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java
@@ -41,6 +41,14 @@ public final class PageBlobUploadPagesFromURLHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The current sequence number for the page blob.
      */
@@ -164,6 +172,32 @@ public PageBlobUploadPagesFromURLHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the PageBlobUploadPagesFromURLHeaders object itself.
+     */
+    public PageBlobUploadPagesFromURLHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the blobSequenceNumber property: The current sequence number for the
      * page blob.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java
index 7dd8eb12ae72..ed9c5a3191a9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java
@@ -41,12 +41,27 @@ public final class PageBlobUploadPagesHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The current sequence number for the page blob.
      */
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -85,6 +100,14 @@ public final class PageBlobUploadPagesHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the pages. This header is only
+     * returned when the pages were encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -172,6 +195,32 @@ public PageBlobUploadPagesHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the PageBlobUploadPagesHeaders object itself.
+     */
+    public PageBlobUploadPagesHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the blobSequenceNumber property: The current sequence number for the
      * page blob.
@@ -194,6 +243,30 @@ public PageBlobUploadPagesHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobUploadPagesHeaders object itself.
+     */
+    public PageBlobUploadPagesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -317,6 +390,30 @@ public PageBlobUploadPagesHeaders encryptionKeySha256(String encryptionKeySha256
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the pages. This header is only returned when the pages were encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the pages. This header is only returned when the pages were encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the PageBlobUploadPagesHeaders object itself.
+     */
+    public PageBlobUploadPagesHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PathRenameMode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PathRenameMode.java
new file mode 100644
index 000000000000..a63e11af27c3
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PathRenameMode.java
@@ -0,0 +1,55 @@
+// 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.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for PathRenameMode.
+ */
+public enum PathRenameMode {
+    /**
+     * Enum value legacy.
+     */
+    LEGACY("legacy"),
+
+    /**
+     * Enum value posix.
+     */
+    POSIX("posix");
+
+    /**
+     * The actual serialized value for a PathRenameMode instance.
+     */
+    private final String value;
+
+    PathRenameMode(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a PathRenameMode instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed PathRenameMode object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static PathRenameMode fromString(String value) {
+        PathRenameMode[] items = PathRenameMode.values();
+        for (PathRenameMode item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java
new file mode 100644
index 000000000000..8fc928767f37
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java
@@ -0,0 +1,42 @@
+// 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.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/**
+ * Defines values for RehydratePriority.
+ */
+public final class RehydratePriority extends ExpandableStringEnum<RehydratePriority> {
+    /**
+     * Static value High for RehydratePriority.
+     */
+    public static final RehydratePriority HIGH = fromString("High");
+
+    /**
+     * Static value Standard for RehydratePriority.
+     */
+    public static final RehydratePriority STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a RehydratePriority from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RehydratePriority.
+     */
+    @JsonCreator
+    public static RehydratePriority fromString(String name) {
+        return fromString(name, RehydratePriority.class);
+    }
+
+    /**
+     * @return known RehydratePriority values.
+     */
+    public static Collection<RehydratePriority> values() {
+        return values(RehydratePriority.class);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceFilterBlobsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceFilterBlobsHeaders.java
new file mode 100644
index 000000000000..ca07c5d37ffb
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceFilterBlobsHeaders.java
@@ -0,0 +1,201 @@
+// 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.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for FilterBlobs operation.
+ */
+@JacksonXmlRootElement(localName = "Service-FilterBlobs-Headers")
+@Fluent
+public final class ServiceFilterBlobsHeaders {
+    /*
+     * The media type of the body of the response. For Filter Blobs this is
+     * 'application/xml'
+     */
+    @JsonProperty(value = "Content-Type")
+    private String contentType;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * 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 dateProperty;
+
+    /*
+     * The errorCode property.
+     */
+    @JsonProperty(value = "x-ms-error-code")
+    private String errorCode;
+
+    /**
+     * Get the contentType property: The media type of the body of the
+     * response. For Filter Blobs this is 'application/xml'.
+     *
+     * @return the contentType value.
+     */
+    public String contentType() {
+        return this.contentType;
+    }
+
+    /**
+     * Set the contentType property: The media type of the body of the
+     * response. For Filter Blobs this is 'application/xml'.
+     *
+     * @param contentType the contentType value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders contentType(String contentType) {
+        this.contentType = contentType;
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @param requestId the requestId value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: 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.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: 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.
+     *
+     * @param version the version value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+
+    /**
+     * Get the errorCode property: The errorCode property.
+     *
+     * @return the errorCode value.
+     */
+    public String errorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * Set the errorCode property: The errorCode property.
+     *
+     * @param errorCode the errorCode value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders errorCode(String errorCode) {
+        this.errorCode = errorCode;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java
index 88fa50830518..aab5284aa123 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Service-GetAccountInfo-Headers")
 @Fluent
 public final class ServiceGetAccountInfoHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -59,6 +66,30 @@ public final class ServiceGetAccountInfoHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetAccountInfoHeaders object itself.
+     */
+    public ServiceGetAccountInfoHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java
index 3b5b06ab3259..4fec9f3c872d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Service-GetProperties-Headers")
 @Fluent
 public final class ServiceGetPropertiesHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class ServiceGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetPropertiesHeaders object itself.
+     */
+    public ServiceGetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java
index 55dda9cc8ddb..a10d852f62cd 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Service-GetStatistics-Headers")
 @Fluent
 public final class ServiceGetStatisticsHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class ServiceGetStatisticsHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetStatisticsHeaders object itself.
+     */
+    public ServiceGetStatisticsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java
index 4a74086587af..f10866c90c55 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Service-GetUserDelegationKey-Headers")
 @Fluent
 public final class ServiceGetUserDelegationKeyHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class ServiceGetUserDelegationKeyHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetUserDelegationKeyHeaders object itself.
+     */
+    public ServiceGetUserDelegationKeyHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java
index 94908506ede7..93e1c98ec97a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Service-ListContainersSegment-Headers")
 @Fluent
 public final class ServiceListContainersSegmentHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class ServiceListContainersSegmentHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceListContainersSegmentHeaders object itself.
+     */
+    public ServiceListContainersSegmentHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java
index df15cc766400..b7ea86bc9fdb 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Service-SetProperties-Headers")
 @Fluent
 public final class ServiceSetPropertiesHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class ServiceSetPropertiesHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceSetPropertiesHeaders object itself.
+     */
+    public ServiceSetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServicesFilterBlobsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServicesFilterBlobsResponse.java
new file mode 100644
index 000000000000..1ab8de38f430
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServicesFilterBlobsResponse.java
@@ -0,0 +1,35 @@
+// 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.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the filterBlobs operation.
+ */
+public final class ServicesFilterBlobsResponse extends ResponseBase<ServiceFilterBlobsHeaders, FilterBlobsResponse> {
+    /**
+     * Creates an instance of ServicesFilterBlobsResponse.
+     *
+     * @param request the request which resulted in this ServicesFilterBlobsResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public ServicesFilterBlobsResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, FilterBlobsResponse value, ServiceFilterBlobsHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+
+    /**
+     * @return the deserialized response body.
+     */
+    @Override
+    public FilterBlobsResponse value() {
+        return super.value();
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java
index 2f8f01f4f6f9..34b97f155d7d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java
@@ -14,38 +14,12 @@
 @JacksonXmlRootElement(localName = "StorageError")
 @Fluent
 public final class StorageError {
-    /*
-     * The code property.
-     */
-    @JsonProperty(value = "Code")
-    private String code;
-
     /*
      * The message property.
      */
     @JsonProperty(value = "Message")
     private String message;
 
-    /**
-     * Get the code property: The code property.
-     *
-     * @return the code value.
-     */
-    public String code() {
-        return this.code;
-    }
-
-    /**
-     * Set the code property: The code property.
-     *
-     * @param code the code value to set.
-     * @return the StorageError object itself.
-     */
-    public StorageError code(String code) {
-        this.code = code;
-        return this;
-    }
-
     /**
      * Get the message property: The message property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java
index 5ef1a7209dee..36fc044b9211 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java
@@ -32,11 +32,6 @@ public final class StorageErrorCode extends ExpandableStringEnum<StorageErrorCod
      */
     public static final StorageErrorCode AUTHENTICATION_FAILED = fromString("AuthenticationFailed");
 
-    /**
-     * Static value AuthorizationFailure for StorageErrorCode.
-     */
-    public static final StorageErrorCode AUTHORIZATION_FAILURE = fromString("AuthorizationFailure");
-
     /**
      * Static value ConditionHeadersNotSupported for StorageErrorCode.
      */
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/Tag.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/Tag.java
new file mode 100644
index 000000000000..121da3ef84ba
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/Tag.java
@@ -0,0 +1,68 @@
+// 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.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * Represents a single user-provided tag.
+ */
+@JacksonXmlRootElement(localName = "Tag")
+@Fluent
+public final class Tag {
+    /*
+     * The tag name.
+     */
+    @JsonProperty(value = "Key", required = true)
+    private String key;
+
+    /*
+     * The tag value.
+     */
+    @JsonProperty(value = "Value", required = true)
+    private String value;
+
+    /**
+     * Get the key property: The tag name.
+     *
+     * @return the key value.
+     */
+    public String key() {
+        return this.key;
+    }
+
+    /**
+     * Set the key property: The tag name.
+     *
+     * @param key the key value to set.
+     * @return the Tag object itself.
+     */
+    public Tag key(String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     * Get the value property: The tag value.
+     *
+     * @return the value value.
+     */
+    public String value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The tag value.
+     *
+     * @param value the value value to set.
+     * @return the Tag object itself.
+     */
+    public Tag value(String value) {
+        this.value = value;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy
index 5d6f364f7e5e..39cf262b6d70 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy
@@ -157,7 +157,7 @@ class AppendBlobAPITest extends APISpec {
 
         downloadStream.toByteArray() == defaultData.array()
         validateBasicHeaders(appendResponse.headers())
-        appendResponse.value().contentMD5() != null
+        appendResponse.headers().value("x-ms-content-crc64") != null
         appendResponse.value().blobAppendOffset() != null
         appendResponse.value().blobCommittedBlockCount() != null
         Integer.parseInt(bu.getProperties().headers().value("x-ms-blob-committed-block-count")) == 1
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy
index d5aaa8a65dcd..88564a9909dd 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy
@@ -32,7 +32,7 @@ class BlockBlobAPITest extends APISpec {
 
         expect:
         response.statusCode() == 201
-        headers.value("Content-MD5") != null
+        headers.value("x-ms-content-crc64") != null
         headers.value("x-ms-request-id") != null
         headers.value("x-ms-version") != null
         headers.value("Date") != null
@@ -128,7 +128,7 @@ class BlockBlobAPITest extends APISpec {
         then:
         headers.value("x-ms-request-id") != null
         headers.value("x-ms-version") != null
-        headers.value("Content-MD5") != null
+        headers.value("x-ms-content-crc64") != null
         headers.value("x-ms-request-server-encrypted") != null
 
 
@@ -311,7 +311,7 @@ class BlockBlobAPITest extends APISpec {
         then:
         response.statusCode() == 201
         validateBasicHeaders(headers)
-        headers.value("Content-MD5")
+        headers.value("x-ms-content-crc64")
         Boolean.parseBoolean(headers.value("x-ms-request-server-encrypted"))
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy
index 26e8ce24a9a0..d3a4cc29e182 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy
@@ -167,7 +167,7 @@ class PageBlobAPITest extends APISpec {
         then:
         response.statusCode() == 201
         validateBasicHeaders(response.headers())
-        response.value().contentMD5() != null
+        response.headers().value("x-ms-content-crc64") != null
         response.value().blobSequenceNumber() == 0
         response.value().isServerEncrypted()
     }
diff --git a/sdk/storage/azure-storage-blob/swagger/README.md b/sdk/storage/azure-storage-blob/swagger/README.md
new file mode 100644
index 000000000000..b9a99db8214a
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/swagger/README.md
@@ -0,0 +1,870 @@
+# Azure Blob Storage for Java
+
+> see https://aka.ms/autorest
+
+### Setup
+```ps
+cd C:\work
+git clone --recursive https://github.com/Azure/autorest.java/
+cd autorest.java
+git checkout v3
+npm install
+cd ..
+git clone --recursive https://github.com/jianghaolu/autorest.modeler/
+cd autorest.modeler
+git checkout headerprefixfix
+npm install
+```
+
+### Generation
+```ps
+cd <swagger-folder>
+autorest --use=C:/work/autorest.java --use=C:/work/autorest.modeler --version=2.0.4280
+```
+
+Due to limitations, after generation has completed add the `@JsonDeserialize(using = CustomHierarchicalListingDeserializer.class)` annotation to `BlobHierarchyListSegment`.
+
+### Code generation settings
+``` yaml
+input-file: ./blob-2019-02-02.json
+java: true
+output-folder: ../
+namespace: com.azure.storage.blob
+enable-xml: true
+generate-client-interfaces: false
+sync-methods: none
+license-header: MICROSOFT_MIT_SMALL
+add-context-parameter: true
+```
+
+### /{containerName}?restype=container
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=acl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=acl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&acquire
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&acquire"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&release
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&release"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&renew
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&renew"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&break
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&break"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&change
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&change"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=list&flat
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=list&flat"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=list&hierarchy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=list&hierarchy"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=account&comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=account&comp=properties"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}/{blob}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+        $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+        $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+        $.get.description = "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or version.";
+        $.head.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+        $.head.parameters.splice(1, 0, { "$ref": path + "Blob" });
+        $.delete.description = "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound). If the storage account's automatic snapshot feature is enabled, then, when a blob is deleted, an automatic snapshot is created. The blob becomes inaccessible immediately. All other operations on the blob causes the service to return an HTTP status code of 404 (ResourceNotFound). You can access automatic snapshot using snapshot timestamp or version id. You can restore the blob by calling Put or Copy Blob API with automatic snapshot as source. Deleting automatic snapshot requires shared key or special SAS/RBAC permissions.";
+        $.delete.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+        $.delete.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?PageBlob
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?PageBlob"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?AppendBlob
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?AppendBlob"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=appendblock
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=appendblock"]
+  transform: >
+    $.put.consumes = ["application/octet-stream"];
+```
+
+### /{containerName}/{blob}?BlockBlob
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?BlockBlob"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=undelete
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=undelete"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=properties&SetHTTPHeaders
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=properties&SetHTTPHeaders"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&acquire
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&acquire"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&release
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&release"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&renew
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&renew"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&change
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&change"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&break
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&break"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=snapshot
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=snapshot"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=copy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=copy"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+      $.put.responses["202"].headers["x-ms-version-id"] = {
+        "x-ms-client-name": "VersionId",
+        "type": "string",
+        "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+      };
+    }
+```
+
+### /{containerName}/{blob}?comp=copy&sync
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=copy&sync"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+      $.put.responses["202"].headers["x-ms-version-id"] = {
+        "x-ms-client-name": "VersionId",
+        "type": "string",
+        "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+      };
+    }
+```
+
+### /{containerName}/{blob}?comp=copy&copyid={CopyId}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=copy&copyid={CopyId}"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=tier
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=tier"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?restype=account&comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?restype=account&comp=properties"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=block
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=block"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=block&fromURL
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=block&fromURL"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=blocklist
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=blocklist"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&update
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&update"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&clear
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&clear"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&clear
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&clear"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&update&fromUrl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&update&fromUrl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=pagelist
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=pagelist"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.get.description = "The Get Page Ranges operation returns the list of valid page ranges for a page blob, version or snapshot of a page blob";
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=pagelist&diff
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=pagelist&diff"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.get.description = "[Update] The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot or version.";
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=properties&Resize
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=properties&Resize"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=properties&UpdateSequenceNumber
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=properties&UpdateSequenceNumber"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=incrementalcopy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=incrementalcopy"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=appendblock
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=appendblock"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=appendblock&fromUrl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=appendblock&fromUrl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### BlobItem
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobItem
+  transform: >
+    if (!$.required.includes("VersionId")) {
+      $.required.push("VersionId");
+      $.properties.Metadata.type = "object";
+      $.properties.Metadata.additionalProperties = { "type": "string" };
+      delete $.properties.Metadata.$ref;
+      $.properties.VersionId = { "type": "string" };
+    }
+    $.properties.IsPrefix = { "type": "boolean" };
+```
+
+### BlobMetadata
+Deleting out Encryption until https://github.com/Azure/azure-sdk-for-java/issues/5000 is determined.
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobMetadata
+  transform: >
+    delete $.properties
+```
+
+### BlobProperties
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobProperties
+  transform: >
+    $.properties.CustomerProvidedKeySha256 = { "type": "string" }
+```
+
+### ListBlobsFlatSegmentResponse
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ListBlobsFlatSegmentResponse
+  transform: >
+    if (!$.required.includes("Prefix")) {
+      $.required.push("Prefix");
+      $.required.push("Marker");
+      $.required.push("MaxResults");
+      $.required.push("Delimiter");
+      $.required.push("NextMarker");
+    }
+```
+
+### ListBlobsHierarchySegmentResponse
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ListBlobsHierarchySegmentResponse
+  transform: >
+    if (!$.required.includes("Prefix")) {
+      $.required.push("Prefix");
+      $.required.push("Marker");
+      $.required.push("MaxResults");
+      $.required.push("Delimiter");
+      $.required.push("NextMarker");
+    }
+```
+
+### ListContainersSegmentResponse
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ListContainersSegmentResponse
+  transform: >
+    if (!$.required.includes("Prefix")) {
+      $.required.push("Prefix");
+      $.required.push("MaxResults");
+      $.required.push("NextMarker");
+    }
+```
+
+### SignedIdentifier
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.SignedIdentifier
+  transform: >
+    if ($.xml) {
+      delete $.xml;
+    }
+- from: swagger-document
+  where: $.definitions.SignedIdentifiers
+  transform: >
+    $.items.xml = { "name": "SignedIdentifier" }
+```
+
+### KeyInfo
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.KeyInfo
+  transform: >
+    if ($["x-ms-parameter-location"]) {
+      delete $["x-ms-parameter-location"];
+    }
+```
+
+### Make AccessTier Unique
+autorest.python complains that the same enum has different values
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.AccessTierRequired
+  transform: >
+    $["x-ms-enum"].name = "AccessTierRequired";
+- from: swagger-document
+  where: $.parameters.AccessTierOptional
+  transform: >
+    $["x-ms-enum"].name = "AccessTierOptional";
+```
+
+### Extra parameters
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters
+  transform: >
+    if (!$.CacheControl) {
+      $.CacheControl = {
+        "name": "Cache-Control",
+        "x-ms-client-name": "cacheControl",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Cache control for given resource"
+      };
+    }
+```
+
+### /{containerName}/{blob}?comp=tags
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=tags"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{filesystem}/{path}?resource=directory&Create
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?resource=directory&Create"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
+
+### /{filesystem}/{path}?DirectoryRename
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?DirectoryRename"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
+
+### /{filesystem}/{path}?DirectoryDelete
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?DirectoryDelete"]
+  transform: >
+    let param = $.delete.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.delete.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.delete.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
+
+### /{filesystem}/{path}?FileRename
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?FileRename"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
diff --git a/sdk/storage/azure-storage-blob/swagger/blob-2018-11-09.json b/sdk/storage/azure-storage-blob/swagger/blob-2018-11-09.json
new file mode 100644
index 000000000000..0c15ff232003
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/swagger/blob-2018-11-09.json
@@ -0,0 +1,8010 @@
+{
+    "swagger": "2.0",
+    "info": {
+      "title": "Azure Blob Storage",
+      "version": "2018-11-09",
+      "x-ms-code-generation-settings": {
+        "header": "MIT",
+        "strictSpecAdherence": false
+      }
+    },
+    "x-ms-parameterized-host": {
+      "hostTemplate": "{url}",
+      "useSchemePrefix": false,
+      "positionInOperation": "first",
+      "parameters": [
+        {
+          "$ref": "#/parameters/Url"
+        }
+      ]
+    },
+    "securityDefinitions": {
+      "blob_shared_key": {
+        "type": "apiKey",
+        "name": "Authorization",
+        "in": "header"
+      }
+    },
+    "schemes": [
+      "https"
+    ],
+    "consumes": [
+      "application/xml"
+    ],
+    "produces": [
+      "application/xml"
+    ],
+    "paths": {},
+    "x-ms-paths": {
+      "/?restype=service&comp=properties": {
+        "put": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_SetProperties",
+          "description": "Sets properties for a storage account's Blob service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
+          "parameters": [
+            {
+              "$ref": "#/parameters/StorageServiceProperties"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "Success (Accepted)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetProperties",
+          "description": "gets the properties of a storage account's Blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceProperties"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/?restype=service&comp=stats": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetStatistics",
+          "description": "Retrieves statistics related to replication for the Blob service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceStats"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "stats"
+            ]
+          }
+        ]
+      },
+      "/?comp=list": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_ListContainersSegment",
+          "description": "The List Containers Segment operation returns a list of the containers under the specified account",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListContainersInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListContainersSegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/?restype=service&comp=userdelegationkey": {
+        "post": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetUserDelegationKey",
+          "description": "Retrieves a user delgation key for the Blob service. This is only a valid operation when using bearer token authentication.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/KeyInfo"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/UserDelegationKey"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "userdelegationkey"
+            ]
+          }
+        ]
+      },
+      "/?restype=account&comp=properties": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetAccountInfo",
+          "description": "Returns the sku name and account kind ",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success (OK)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-sku-name": {
+                  "x-ms-client-name": "SkuName",
+                  "type": "string",
+                  "enum": [
+                    "Standard_LRS",
+                    "Standard_GRS",
+                    "Standard_RAGRS",
+                    "Standard_ZRS",
+                    "Premium_LRS"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SkuName",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the sku name of the account"
+                },
+                "x-ms-account-kind": {
+                  "x-ms-client-name": "AccountKind",
+                  "type": "string",
+                  "enum": [
+                    "Storage",
+                    "BlobStorage",
+                    "StorageV2"
+                  ],
+                  "x-ms-enum": {
+                    "name": "AccountKind",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the account kind"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "account"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_Create",
+          "description": "creates a new container under the specified account. If the container with the same name already exists, the operation fails",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/BlobPublicAccess"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "Success, Container created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_GetProperties",
+          "description": "returns all user-defined metadata and system properties for the specified container. The data returned does not include the container's list of blobs",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-public-access": {
+                  "x-ms-client-name": "BlobPublicAccess",
+                  "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                  "type": "string",
+                  "enum": [
+                    "container",
+                    "blob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "PublicAccessType",
+                    "modelAsString": true
+                  }
+                },
+                "x-ms-has-immutability-policy": {
+                  "x-ms-client-name": "HasImmutabilityPolicy",
+                  "description": "Indicates whether the container has an immutability policy set on it.",
+                  "type": "boolean"
+                },
+                "x-ms-has-legal-hold": {
+                  "x-ms-client-name": "HasLegalHold",
+                  "description": "Indicates whether the container has a legal hold.",
+                  "type": "boolean"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_Delete",
+          "description": "operation marks the specified container for deletion. The container and any blobs contained within it are later deleted during garbage collection",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "Accepted",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=metadata": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_SetMetadata",
+          "description": "operation sets one or more user-defined name-value pairs for the specified container.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "metadata"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=acl": {
+        "get": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_GetAccessPolicy",
+          "description": "gets the permissions for the specified container. The permissions indicate whether container data may be accessed publicly.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "x-ms-blob-public-access": {
+                  "x-ms-client-name": "BlobPublicAccess",
+                  "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                  "type": "string",
+                  "enum": [
+                    "container",
+                    "blob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "PublicAccessType",
+                    "modelAsString": true
+                  }
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/SignedIdentifiers"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_SetAccessPolicy",
+          "description": "sets the permissions for the specified container. The permissions indicate whether blobs in a container may be accessed publicly.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ContainerAcl"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobPublicAccess"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acl"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&acquire": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_AcquireLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseDuration"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The Acquire operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a container's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acquire"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&release": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_ReleaseLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Release operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "release"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&renew": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_RenewLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Renew operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a container's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "renew"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&break": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_BreakLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseBreakPeriod"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The Break operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-time": {
+                  "x-ms-client-name": "LeaseTime",
+                  "type": "integer",
+                  "description": "Approximate time remaining in the lease period, in seconds."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "break"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&change": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_ChangeLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Change operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a container's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "change"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=list&flat": {
+        "get": {
+          "tags": [
+            "containers"
+          ],
+          "operationId": "Container_ListBlobFlatSegment",
+          "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListBlobsInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListBlobsFlatSegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=list&hierarchy": {
+        "get": {
+          "tags": [
+            "containers"
+          ],
+          "operationId": "Container_ListBlobHierarchySegment",
+          "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Delimiter"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListBlobsInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListBlobsHierarchySegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=account&comp=properties": {
+        "get": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_GetAccountInfo",
+          "description": "Returns the sku name and account kind ",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success (OK)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-sku-name": {
+                  "x-ms-client-name": "SkuName",
+                  "type": "string",
+                  "enum": [
+                    "Standard_LRS",
+                    "Standard_GRS",
+                    "Standard_RAGRS",
+                    "Standard_ZRS",
+                    "Premium_LRS"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SkuName",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the sku name of the account"
+                },
+                "x-ms-account-kind": {
+                  "x-ms-client-name": "AccountKind",
+                  "type": "string",
+                  "enum": [
+                    "Storage",
+                    "BlobStorage",
+                    "StorageV2"
+                  ],
+                  "x-ms-enum": {
+                    "name": "AccountKind",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the account kind"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "account"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}": {
+        "get": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_Download",
+          "description": "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/GetRangeContentMD5"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Returns the content of the entire blob.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "Content-Length": {
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The number of bytes present in the response body."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                },
+                "Content-Range": {
+                  "type": "string",
+                  "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "Content-Encoding": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Encoding request header"
+                },
+                "Cache-Control": {
+                  "type": "string",
+                  "description": "This header is returned if it was previously specified for the blob."
+                },
+                "Content-Disposition": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                },
+                "Content-Language": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Language request header."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-blob-type": {
+                  "x-ms-client-name": "BlobType",
+                  "description": "The blob's type.",
+                  "type": "string",
+                  "enum": [
+                    "BlockBlob",
+                    "PageBlob",
+                    "AppendBlob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "BlobType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-copy-completion-time": {
+                  "x-ms-client-name": "CopyCompletionTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status-description": {
+                  "x-ms-client-name": "CopyStatusDescription",
+                  "type": "string",
+                  "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-progress": {
+                  "x-ms-client-name": "CopyProgress",
+                  "type": "string",
+                  "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-source": {
+                  "x-ms-client-name": "CopySource",
+                  "type": "string",
+                  "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Accept-Ranges": {
+                  "type": "string",
+                  "description": "Indicates that the service supports requests for partial blob content."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+            "x-ms-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                },
+                "x-ms-blob-content-md5": {
+                  "x-ms-client-name": "BlobContentMD5",
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                }
+              },
+              "schema": {
+                "type": "object",
+                "format": "file"
+              }
+            },
+            "206": {
+              "description": "Returns the content of a specified range of the blob.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "Content-Length": {
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The number of bytes present in the response body."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                },
+                "Content-Range": {
+                  "type": "string",
+                  "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "Content-Encoding": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Encoding request header"
+                },
+                "Cache-Control": {
+                  "type": "string",
+                  "description": "This header is returned if it was previously specified for the blob."
+                },
+                "Content-Disposition": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                },
+                "Content-Language": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Language request header."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-blob-type": {
+                  "x-ms-client-name": "BlobType",
+                  "description": "The blob's type.",
+                  "type": "string",
+                  "enum": [
+                    "BlockBlob",
+                    "PageBlob",
+                    "AppendBlob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "BlobType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-copy-completion-time": {
+                  "x-ms-client-name": "CopyCompletionTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status-description": {
+                  "x-ms-client-name": "CopyStatusDescription",
+                  "type": "string",
+                  "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-progress": {
+                  "x-ms-client-name": "CopyProgress",
+                  "type": "string",
+                  "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-source": {
+                  "x-ms-client-name": "CopySource",
+                  "type": "string",
+                  "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Accept-Ranges": {
+                  "type": "string",
+                  "description": "Indicates that the service supports requests for partial blob content."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+            "x-ms-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                },
+                "x-ms-blob-content-md5": {
+                  "x-ms-client-name": "BlobContentMD5",
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                }
+              },
+              "schema": {
+                "type": "object",
+                "format": "file"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "head": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_GetProperties",
+          "description": "The Get Properties operation returns all user-defined metadata, standard HTTP properties, and system properties for the blob. It does not return the content of the blob.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Returns the properties of the blob.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-creation-time": {
+                  "x-ms-client-name": "CreationTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was created."
+                },
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "x-ms-blob-type": {
+                  "x-ms-client-name": "BlobType",
+                  "description": "The blob's type.",
+                  "type": "string",
+                  "enum": [
+                    "BlockBlob",
+                    "PageBlob",
+                    "AppendBlob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "BlobType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-copy-completion-time": {
+                  "x-ms-client-name": "CopyCompletionTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status-description": {
+                  "x-ms-client-name": "CopyStatusDescription",
+                  "type": "string",
+                  "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-progress": {
+                  "x-ms-client-name": "CopyProgress",
+                  "type": "string",
+                  "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-source": {
+                  "x-ms-client-name": "CopySource",
+                  "type": "string",
+                  "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-incremental-copy": {
+                  "x-ms-client-name": "IsIncrementalCopy",
+                  "type": "boolean",
+                  "description": "Included if the blob is incremental copy blob."
+                },
+                "x-ms-copy-destination-snapshot": {
+                  "x-ms-client-name": "DestinationSnapshot",
+                  "type": "string",
+                  "description": "Included if the blob is incremental copy blob or incremental copy snapshot, if x-ms-copy-status is success. Snapshot time of the last successful incremental copy snapshot for this blob."
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "Content-Length": {
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The number of bytes present in the response body."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The content type specified for the blob. The default content type is 'application/octet-stream'"
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "Content-Encoding": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Encoding request header"
+                },
+                "Content-Disposition": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                },
+                "Content-Language": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Language request header."
+                },
+                "Cache-Control": {
+                  "type": "string",
+                  "description": "This header is returned if it was previously specified for the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "Accept-Ranges": {
+                  "type": "string",
+                  "description": "Indicates that the service supports requests for partial blob content."
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+            "x-ms-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                },
+                "x-ms-access-tier": {
+                  "x-ms-client-name": "AccessTier",
+                  "type": "string",
+                  "description": "The tier of page blob on a premium storage account or tier of block blob on blob storage LRS accounts. For a list of allowed premium page blob tiers, see https://docs.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features. For blob storage LRS accounts, valid values are Hot/Cool/Archive."
+                },
+                "x-ms-access-tier-inferred": {
+                  "x-ms-client-name": "AccessTierInferred",
+                  "type": "boolean",
+                  "description": "For page blobs on a premium storage account only. If the access tier is not explicitly set on the blob, the tier is inferred based on its content length and this header will be returned with true value."
+                },
+                "x-ms-archive-status": {
+                  "x-ms-client-name": "ArchiveStatus",
+                  "type": "string",
+                  "description": "For blob storage LRS accounts, valid values are rehydrate-pending-to-hot/rehydrate-pending-to-cool. If the blob is being rehydrated and is not complete then this header is returned indicating that rehydrate is pending and also tells the destination tier."
+                },
+                "x-ms-access-tier-change-time": {
+                  "x-ms-client-name": "AccessTierChangeTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "The time the tier was changed on the object. This is only returned if the tier on the block blob was ever set."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_Delete",
+          "description": "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound).",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/DeleteSnapshots"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The delete request was accepted and the blob will be deleted.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        }
+      },
+      "/{containerName}/{blob}?PageBlob": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "PageBlob_Create",
+          "description": "The Create operation creates a new page blob.",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLengthRequired"
+            },
+            {
+              "$ref": "#/parameters/BlobSequenceNumber"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The blob was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+            "x-ms-request-server-encrypted": {
+          "x-ms-client-name": "IsServerEncrypted",
+          "type": "boolean",
+          "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+            }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-blob-type",
+            "x-ms-client-name": "blobType",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+            "type": "string",
+            "enum": [
+              "PageBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?AppendBlob": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "AppendBlob_Create",
+          "description": "The Create Append Blob operation creates a new append blob.",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The blob was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-blob-type",
+            "x-ms-client-name": "blobType",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+            "type": "string",
+            "enum": [
+              "AppendBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?BlockBlob": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "BlockBlob_Upload",
+          "description": "The Upload Block Blob operation updates the content of an existing block blob. Updating an existing block blob overwrites any existing metadata on the blob. Partial updates are not supported with Put Blob; the content of the existing blob is overwritten with the content of the new blob. To perform a partial update of the content of a block blob, use the Put Block List operation.",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The blob was updated.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-blob-type",
+            "x-ms-client-name": "blobType",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+            "type": "string",
+            "enum": [
+              "BlockBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=undelete": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_Undelete",
+          "description": "Undelete a blob that was previously soft deleted",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The blob was undeleted successfully.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "undelete"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=properties&SetHTTPHeaders": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_SetHTTPHeaders",
+          "description": "The Set HTTP Headers operation sets system properties on the blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The properties were set successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=metadata": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_SetMetadata",
+          "description": "The Set Blob Metadata operation sets user-defined metadata for the specified blob as one or more name-value pairs",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The metadata was set successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "metadata"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&acquire": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_AcquireLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseDuration"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The Acquire operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a blobs's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acquire"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&release": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_ReleaseLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Release operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "release"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&renew": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_RenewLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Renew operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a blobs's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "renew"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&change": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_ChangeLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Change operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a blobs's lease"
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "change"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&break": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_BreakLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseBreakPeriod"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The Break operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-time": {
+                  "x-ms-client-name": "LeaseTime",
+                  "type": "integer",
+                  "description": "Approximate time remaining in the lease period, in seconds."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "break"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=snapshot": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_CreateSnapshot",
+          "description": "The Create Snapshot operation creates a read-only snapshot of a blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The snaptshot was taken successfully.",
+              "headers": {
+                "x-ms-snapshot": {
+                  "x-ms-client-name": "Snapshot",
+                  "type": "string",
+                  "description": "Uniquely identifies the snapshot and indicates the snapshot version. It may be used in subsequent requests to access the snapshot"
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "snapshot"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=copy": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_StartCopyFromURL",
+          "description": "The Start Copy From URL operation copies a blob or an internet resource to a new blob.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/CopySource"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The copy blob has been accepted with the specified copy status.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{containerName}/{blob}?comp=copy&sync": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_CopyFromURL",
+          "description": "The Copy From URL operation copies a blob or an internet resource to a new blob. It will not return a response until the copy is complete.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/CopySource"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The copy has completed.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "success"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SyncCopyStatusType",
+                    "modelAsString": false
+                  }
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-requires-sync",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "true"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=copy&copyid={CopyId}": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_AbortCopyFromURL",
+          "description": "The Abort Copy From URL operation aborts a pending Copy From URL operation, and leaves a destination blob with zero length and full metadata.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/CopyId"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "The delete request was accepted and the blob will be deleted.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "copy"
+            ]
+          },
+          {
+            "name": "x-ms-copy-action",
+            "x-ms-client-name": "copyActionAbortConstant",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "abort"
+            ],
+            "x-ms-parameter-location": "method"
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=tier": {
+        "put": {
+          "tags": [
+            "blobs"
+          ],
+          "operationId": "Blob_SetTier",
+          "description": "The Set Tier operation sets the tier on a blob. The operation is allowed on a page blob in a premium storage account and on a block blob in a blob storage account (locally redundant storage only). A premium page blob's tier determines the allowed size, IOPS, and bandwidth of the blob. A block blob's tier determines Hot/Cool/Archive storage type. This operation does not update the blob's ETag.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/AccessTier"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The new tier will take effect immediately.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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 newer."
+                }
+              }
+            },
+            "202": {
+              "description": "The transition to the new tier is pending.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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 newer."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "tier"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?restype=account&comp=properties": {
+        "get": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_GetAccountInfo",
+          "description": "Returns the sku name and account kind ",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success (OK)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-sku-name": {
+                  "x-ms-client-name": "SkuName",
+                  "type": "string",
+                  "enum": [
+                    "Standard_LRS",
+                    "Standard_GRS",
+                    "Standard_RAGRS",
+                    "Standard_ZRS",
+                    "Premium_LRS"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SkuName",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the sku name of the account"
+                },
+                "x-ms-account-kind": {
+                  "x-ms-client-name": "AccountKind",
+                  "type": "string",
+                  "enum": [
+                    "Storage",
+                    "BlobStorage",
+                    "StorageV2"
+                  ],
+                  "x-ms-enum": {
+                    "name": "AccountKind",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the account kind"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "account"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=block": {
+        "put": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_StageBlock",
+          "description": "The Stage Block operation creates a new block to be committed as part of a blob",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/BlockId"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/ContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "block"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=block&fromURL": {
+        "put": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_StageBlockFromURL",
+          "description": "The Stage Block operation creates a new block to be committed as part of a blob where the contents are read from a URL.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/BlockId"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/SourceUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceRange"
+            },
+            {
+              "$ref": "#/parameters/SourceContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+             {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+              }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                  },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "block"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=blocklist": {
+        "put": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_CommitBlockList",
+          "description": "The Commit Block List operation writes a blob by specifying the list of block IDs that make up the blob. In order to be written as part of a blob, a block must have been successfully written to the server in a prior Put Block operation. You can call Put Block List to update a blob by uploading only those blocks that have changed, then committing the new and existing blocks together. You can do this by specifying whether to commit a block from the committed block list or from the uncommitted block list, or to commit the most recently uploaded version of the block, whichever list it may belong to.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "name": "blocks",
+              "in": "body",
+              "required": true,
+              "schema": {
+                "$ref": "#/definitions/BlockLookupList"
+              }
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block list was recorded.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_GetBlockList",
+          "description": "The Get Block List operation retrieves the list of blocks that have been uploaded as part of a block blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/BlockListType"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The page range was written.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For Get Block List this is 'application/xml'"
+                },
+                "x-ms-blob-content-length": {
+                  "x-ms-client-name": "BlobContentLength",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The size of the blob in bytes."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/BlockList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "blocklist"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=page&update": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_UploadPages",
+          "description": "The Upload Pages operation writes a range of pages to a page blob",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/ContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThan"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The page range was written.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for the page blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "page"
+            ]
+          },
+          {
+            "name": "x-ms-page-write",
+            "x-ms-client-name": "pageWrite",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+            "type": "string",
+            "enum": [
+              "update"
+            ],
+            "x-ms-enum": {
+              "name": "PageWriteType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=page&clear": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_ClearPages",
+          "description": "The Clear Pages operation clears a set of pages from a page blob",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThan"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The page range was cleared.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for the page blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "page"
+            ]
+          },
+          {
+            "name": "x-ms-page-write",
+            "x-ms-client-name": "pageWrite",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+            "type": "string",
+            "enum": [
+              "clear"
+            ],
+            "x-ms-enum": {
+              "name": "PageWriteType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=page&update&fromUrl": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_UploadPagesFromURL",
+          "description": "The Upload Pages operation writes a range of pages to a page blob where the contents are read from a URL",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/SourceUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceRangeRequiredPutPageFromUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceContentMD5"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/RangeRequiredPutPageFromUrl"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThan"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The page range was written.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for the page blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "page"
+            ]
+          },
+          {
+            "name": "x-ms-page-write",
+            "x-ms-client-name": "pageWrite",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+            "type": "string",
+            "enum": [
+              "update"
+            ],
+            "x-ms-enum": {
+              "name": "PageWriteType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=pagelist": {
+        "get": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_GetPageRanges",
+          "description": "The Get Page Ranges operation returns the list of valid page ranges for a page blob or snapshot of a page blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Information on the page blob was found.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "x-ms-blob-content-length": {
+                  "x-ms-client-name": "BlobContentLength",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The size of the blob in bytes."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/PageList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "pagelist"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=pagelist&diff": {
+        "get": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_GetPageRangesDiff",
+          "description": "The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/PrevSnapshot"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Information on the page blob was found.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "x-ms-blob-content-length": {
+                  "x-ms-client-name": "BlobContentLength",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The size of the blob in bytes."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/PageList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "pagelist"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=properties&Resize": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_Resize",
+          "description": "Resize the Blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLengthRequired"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Blob was resized successfully",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=properties&UpdateSequenceNumber": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_UpdateSequenceNumber",
+          "description": "Update the sequence number of the blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/SequenceNumberAction"
+            },
+            {
+              "$ref": "#/parameters/BlobSequenceNumber"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The sequence numbers were updated successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=incrementalcopy": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_CopyIncremental",
+          "description": "The Copy Incremental operation copies a snapshot of the source page blob to a destination page blob. The snapshot is copied such that only the differential changes between the previously copied snapshot are transferred to the destination. The copied snapshots are complete copies of the original snapshot and can be read or copied from as usual. This API is supported since REST version 2016-05-31.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/CopySource"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The blob was copied.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "incrementalcopy"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=appendblock": {
+        "put": {
+          "tags": [
+            "appendblob"
+          ],
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "operationId": "AppendBlob_AppendBlock",
+          "description": "The Append Block operation commits a new block of data to the end of an existing append blob. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/ContentMD5"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionMaxSize"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionAppendPos"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-append-offset": {
+                  "x-ms-client-name": "BlobAppendOffset",
+                  "type": "string",
+                  "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "appendblock"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=appendblock&fromUrl": {
+        "put": {
+          "tags": [
+            "appendblob"
+          ],
+          "operationId": "AppendBlob_AppendBlockFromUrl",
+          "description": "The Append Block operation commits a new block of data to the end of an existing append blob where the contents are read from a source url. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/SourceUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceRange"
+            },
+            {
+              "$ref": "#/parameters/SourceContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionMaxSize"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionAppendPos"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "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."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-append-offset": {
+                  "x-ms-client-name": "BlobAppendOffset",
+                  "type": "string",
+                  "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "appendblock"
+            ]
+          }
+        ]
+      }
+    },
+    "definitions": {
+      "KeyInfo": {
+        "type": "object",
+        "required": [
+          "Start",
+          "Expiry"
+        ],
+        "description": "Key information",
+        "properties": {
+          "Start": {
+            "description": "The date-time the key is active in ISO 8601 UTC time",
+            "type": "string"
+          },
+          "Expiry": {
+            "description": "The date-time the key expires in ISO 8601 UTC time",
+            "type": "string"
+          }
+        }
+      },
+      "UserDelegationKey": {
+        "type": "object",
+        "required": [
+          "SignedOid",
+          "SignedTid",
+          "SignedStart",
+          "SignedExpiry",
+          "SignedService",
+          "SignedVersion",
+          "Value"
+        ],
+        "description": "A user delegation key",
+        "properties": {
+          "SignedOid": {
+            "description": "The Azure Active Directory object ID in GUID format.",
+            "type": "string"
+          },
+          "SignedTid": {
+            "description": "The Azure Active Directory tenant ID in GUID format",
+            "type": "string"
+          },
+          "SignedStart": {
+            "description": "The date-time the key is active",
+            "type": "string",
+            "format": "date-time"
+          },
+          "SignedExpiry": {
+            "description": "The date-time the key expires",
+            "type": "string",
+            "format": "date-time"
+          },
+          "SignedService": {
+            "description": "Abbreviation of the Azure Storage service that accepts the key",
+            "type": "string"
+          },
+          "SignedVersion": {
+            "description": "The service version that created the key",
+            "type": "string"
+          },
+          "Value": {
+            "description": "The key as a base64 string",
+            "type": "string"
+          }
+        }
+      },
+      "PublicAccessType": {
+        "type": "string",
+        "enum": [
+          "container",
+          "blob"
+        ],
+        "x-ms-enum": {
+          "name": "PublicAccessType",
+          "modelAsString": true
+        }
+      },
+      "CopyStatus": {
+        "type": "string",
+        "enum": [
+          "pending",
+          "success",
+          "aborted",
+          "failed"
+        ],
+        "x-ms-enum": {
+          "name": "CopyStatusType",
+          "modelAsString": false
+        }
+      },
+      "LeaseDuration": {
+        "type": "string",
+        "enum": [
+          "infinite",
+          "fixed"
+        ],
+        "x-ms-enum": {
+          "name": "LeaseDurationType",
+          "modelAsString": false
+        }
+      },
+      "LeaseState": {
+        "type": "string",
+        "enum": [
+          "available",
+          "leased",
+          "expired",
+          "breaking",
+          "broken"
+        ],
+        "x-ms-enum": {
+          "name": "LeaseStateType",
+          "modelAsString": false
+        }
+      },
+      "LeaseStatus": {
+        "type": "string",
+        "enum": [
+          "locked",
+          "unlocked"
+        ],
+        "x-ms-enum": {
+          "name": "LeaseStatusType",
+          "modelAsString": false
+        }
+      },
+      "StorageError": {
+        "type": "object",
+        "properties": {
+          "Code": {
+            "type": "string"
+          },
+          "Message": {
+            "type": "string"
+          }
+        }
+      },
+      "AccessPolicy": {
+        "type": "object",
+        "required": [
+          "Start",
+          "Expiry",
+          "Permission"
+        ],
+        "description": "An Access policy",
+        "properties": {
+          "Start": {
+            "description": "the date-time the policy is active",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Expiry": {
+            "description": "the date-time the policy expires",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Permission": {
+            "description": "the permissions for the acl policy",
+            "type": "string"
+          }
+        }
+      },
+      "AccessTier": {
+        "type": "string",
+        "enum": [
+          "P4",
+          "P6",
+          "P10",
+          "P20",
+          "P30",
+          "P40",
+          "P50",
+          "Hot",
+          "Cool",
+          "Archive"
+        ],
+        "x-ms-enum": {
+          "name": "AccessTier",
+          "modelAsString": true
+        }
+      },
+      "ArchiveStatus": {
+        "type": "string",
+        "enum": [
+          "rehydrate-pending-to-hot",
+          "rehydrate-pending-to-cool"
+        ],
+        "x-ms-enum": {
+          "name": "ArchiveStatus",
+          "modelAsString": true
+        }
+      },
+      "BlobItem": {
+        "xml": {
+          "name": "Blob"
+        },
+        "description": "An Azure Storage blob",
+        "type": "object",
+        "required": [
+          "Name",
+          "Deleted",
+          "Snapshot",
+          "Properties"
+        ],
+        "properties": {
+          "Name": {
+            "type": "string"
+          },
+          "Deleted": {
+            "type": "boolean"
+          },
+          "Snapshot": {
+            "type": "string"
+          },
+          "Properties": {
+            "$ref": "#/definitions/BlobProperties"
+          },
+          "Metadata": {
+            "$ref": "#/definitions/Metadata"
+          }
+        }
+      },
+      "BlobProperties": {
+        "xml": {
+          "name": "Properties"
+        },
+        "description": "Properties of a blob",
+        "type": "object",
+        "required": [
+          "Etag",
+          "Last-Modified"
+        ],
+        "properties": {
+          "Creation-Time": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "Last-Modified": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "Etag": {
+            "type": "string",
+            "format": "etag"
+          },
+          "Content-Length": {
+            "type": "integer",
+            "format": "int64",
+            "description": "Size in bytes"
+          },
+          "Content-Type": {
+            "type": "string"
+          },
+          "Content-Encoding": {
+            "type": "string"
+          },
+          "Content-Language": {
+            "type": "string"
+          },
+          "Content-MD5": {
+            "type": "string",
+            "format": "byte"
+          },
+          "Content-Disposition": {
+            "type": "string"
+          },
+          "Cache-Control": {
+            "type": "string"
+          },
+          "x-ms-blob-sequence-number": {
+            "x-ms-client-name": "blobSequenceNumber",
+            "type": "integer",
+            "format": "int64"
+          },
+          "BlobType": {
+            "type": "string",
+            "enum": [
+              "BlockBlob",
+              "PageBlob",
+              "AppendBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          },
+          "LeaseStatus": {
+            "$ref": "#/definitions/LeaseStatus"
+          },
+          "LeaseState": {
+            "$ref": "#/definitions/LeaseState"
+          },
+          "LeaseDuration": {
+            "$ref": "#/definitions/LeaseDuration"
+          },
+          "CopyId": {
+            "type": "string"
+          },
+          "CopyStatus": {
+            "$ref": "#/definitions/CopyStatus"
+          },
+          "CopySource": {
+            "type": "string"
+          },
+          "CopyProgress": {
+            "type": "string"
+          },
+          "CopyCompletionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "CopyStatusDescription": {
+            "type": "string"
+          },
+          "ServerEncrypted": {
+            "type": "boolean"
+          },
+          "IncrementalCopy": {
+            "type": "boolean"
+          },
+          "DestinationSnapshot": {
+            "type": "string"
+          },
+          "DeletedTime": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "RemainingRetentionDays": {
+            "type": "integer"
+          },
+          "AccessTier": {
+            "$ref": "#/definitions/AccessTier"
+          },
+          "AccessTierInferred": {
+            "type": "boolean"
+          },
+          "ArchiveStatus": {
+            "$ref": "#/definitions/ArchiveStatus"
+          },
+          "AccessTierChangeTime": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          }
+        }
+      },
+      "ListBlobsFlatSegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "An enumeration of blobs",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "ContainerName",
+          "Segment"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "ContainerName": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "Delimiter": {
+            "type": "string"
+          },
+          "Segment": {
+            "$ref": "#/definitions/BlobFlatListSegment"
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "ListBlobsHierarchySegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "An enumeration of blobs",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "ContainerName",
+          "Segment"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "ContainerName": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "Delimiter": {
+            "type": "string"
+          },
+          "Segment": {
+            "$ref": "#/definitions/BlobHierarchyListSegment"
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "BlobFlatListSegment": {
+        "xml": {
+          "name": "Blobs"
+        },
+        "required": [
+          "BlobItems"
+        ],
+        "type": "object",
+        "properties": {
+          "BlobItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/BlobItem"
+            }
+          }
+        }
+      },
+      "BlobHierarchyListSegment": {
+        "xml": {
+          "name": "Blobs"
+        },
+        "type": "object",
+        "required": [
+          "BlobItems"
+        ],
+        "properties": {
+          "BlobPrefixes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/BlobPrefix"
+            }
+          },
+          "BlobItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/BlobItem"
+            }
+          }
+        }
+      },
+      "BlobPrefix": {
+        "type": "object",
+        "required": [
+          "Name"
+        ],
+        "properties": {
+          "Name": {
+            "type": "string"
+          }
+        }
+      },
+      "Block": {
+        "type": "object",
+        "required": [
+          "Name",
+          "Size"
+        ],
+        "description": "Represents a single block in a block blob.  It describes the block's ID and size.",
+        "properties": {
+          "Name": {
+            "description": "The base64 encoded block ID.",
+            "type": "string"
+          },
+          "Size": {
+            "description": "The block size in bytes.",
+            "type": "integer"
+          }
+        }
+      },
+      "BlockList": {
+        "type": "object",
+        "properties": {
+          "CommittedBlocks": {
+            "xml": {
+              "wrapped": true
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/Block"
+            }
+          },
+          "UncommittedBlocks": {
+            "xml": {
+              "wrapped": true
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/Block"
+            }
+          }
+        }
+      },
+      "BlockLookupList": {
+        "type": "object",
+        "properties": {
+          "Committed": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "xml": {
+                "name": "Committed"
+              }
+            }
+          },
+          "Uncommitted": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "xml": {
+                "name": "Uncommitted"
+              }
+            }
+          },
+          "Latest": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "xml": {
+                "name": "Latest"
+              }
+            }
+          }
+        },
+        "xml": {
+          "name": "BlockList"
+        }
+      },
+      "ContainerItem": {
+        "xml": {
+          "name": "Container"
+        },
+        "type": "object",
+        "required": [
+          "Name",
+          "Properties"
+        ],
+        "description": "An Azure Storage container",
+        "properties": {
+          "Name": {
+            "type": "string"
+          },
+          "Properties": {
+            "$ref": "#/definitions/ContainerProperties"
+          },
+          "Metadata": {
+            "$ref": "#/definitions/Metadata"
+          }
+        }
+      },
+      "ContainerProperties": {
+        "type": "object",
+        "required": [
+          "Last-Modified",
+          "Etag"
+        ],
+        "description": "Properties of a container",
+        "properties": {
+          "Last-Modified": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "Etag": {
+            "type": "string",
+            "format": "etag"
+          },
+          "LeaseStatus": {
+            "$ref": "#/definitions/LeaseStatus"
+          },
+          "LeaseState": {
+            "$ref": "#/definitions/LeaseState"
+          },
+          "LeaseDuration": {
+            "$ref": "#/definitions/LeaseDuration"
+          },
+          "PublicAccess": {
+            "$ref": "#/definitions/PublicAccessType"
+          },
+          "HasImmutabilityPolicy": {
+            "type": "boolean"
+          },
+          "HasLegalHold": {
+            "type": "boolean"
+          }
+        }
+      },
+      "ListContainersSegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "An enumeration of containers",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "ContainerItems"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "ContainerItems": {
+            "xml": {
+              "wrapped": true,
+              "name": "Containers"
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/ContainerItem"
+            }
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "CorsRule": {
+        "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
+        "type": "object",
+        "required": [
+          "AllowedOrigins",
+          "AllowedMethods",
+          "AllowedHeaders",
+          "ExposedHeaders",
+          "MaxAgeInSeconds"
+        ],
+        "properties": {
+          "AllowedOrigins": {
+            "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
+            "type": "string"
+          },
+          "AllowedMethods": {
+            "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
+            "type": "string"
+          },
+          "AllowedHeaders": {
+            "description": "the request headers that the origin domain may specify on the CORS request.",
+            "type": "string"
+          },
+          "ExposedHeaders": {
+            "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
+            "type": "string"
+          },
+          "MaxAgeInSeconds": {
+            "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+            "type": "integer",
+            "minimum": 0
+          }
+        }
+      },
+      "ErrorCode": {
+        "description": "Error codes returned by the service",
+        "type": "string",
+        "enum": [
+          "AccountAlreadyExists",
+          "AccountBeingCreated",
+          "AccountIsDisabled",
+          "AuthenticationFailed",
+          "AuthorizationFailure",
+          "ConditionHeadersNotSupported",
+          "ConditionNotMet",
+          "EmptyMetadataKey",
+          "InsufficientAccountPermissions",
+          "InternalError",
+          "InvalidAuthenticationInfo",
+          "InvalidHeaderValue",
+          "InvalidHttpVerb",
+          "InvalidInput",
+          "InvalidMd5",
+          "InvalidMetadata",
+          "InvalidQueryParameterValue",
+          "InvalidRange",
+          "InvalidResourceName",
+          "InvalidUri",
+          "InvalidXmlDocument",
+          "InvalidXmlNodeValue",
+          "Md5Mismatch",
+          "MetadataTooLarge",
+          "MissingContentLengthHeader",
+          "MissingRequiredQueryParameter",
+          "MissingRequiredHeader",
+          "MissingRequiredXmlNode",
+          "MultipleConditionHeadersNotSupported",
+          "OperationTimedOut",
+          "OutOfRangeInput",
+          "OutOfRangeQueryParameterValue",
+          "RequestBodyTooLarge",
+          "ResourceTypeMismatch",
+          "RequestUrlFailedToParse",
+          "ResourceAlreadyExists",
+          "ResourceNotFound",
+          "ServerBusy",
+          "UnsupportedHeader",
+          "UnsupportedXmlNode",
+          "UnsupportedQueryParameter",
+          "UnsupportedHttpVerb",
+          "AppendPositionConditionNotMet",
+          "BlobAlreadyExists",
+          "BlobNotFound",
+          "BlobOverwritten",
+          "BlobTierInadequateForContentLength",
+          "BlockCountExceedsLimit",
+          "BlockListTooLong",
+          "CannotChangeToLowerTier",
+          "CannotVerifyCopySource",
+          "ContainerAlreadyExists",
+          "ContainerBeingDeleted",
+          "ContainerDisabled",
+          "ContainerNotFound",
+          "ContentLengthLargerThanTierLimit",
+          "CopyAcrossAccountsNotSupported",
+          "CopyIdMismatch",
+          "FeatureVersionMismatch",
+          "IncrementalCopyBlobMismatch",
+          "IncrementalCopyOfEralierVersionSnapshotNotAllowed",
+          "IncrementalCopySourceMustBeSnapshot",
+          "InfiniteLeaseDurationRequired",
+          "InvalidBlobOrBlock",
+          "InvalidBlobTier",
+          "InvalidBlobType",
+          "InvalidBlockId",
+          "InvalidBlockList",
+          "InvalidOperation",
+          "InvalidPageRange",
+          "InvalidSourceBlobType",
+          "InvalidSourceBlobUrl",
+          "InvalidVersionForPageBlobOperation",
+          "LeaseAlreadyPresent",
+          "LeaseAlreadyBroken",
+          "LeaseIdMismatchWithBlobOperation",
+          "LeaseIdMismatchWithContainerOperation",
+          "LeaseIdMismatchWithLeaseOperation",
+          "LeaseIdMissing",
+          "LeaseIsBreakingAndCannotBeAcquired",
+          "LeaseIsBreakingAndCannotBeChanged",
+          "LeaseIsBrokenAndCannotBeRenewed",
+          "LeaseLost",
+          "LeaseNotPresentWithBlobOperation",
+          "LeaseNotPresentWithContainerOperation",
+          "LeaseNotPresentWithLeaseOperation",
+          "MaxBlobSizeConditionNotMet",
+          "NoPendingCopyOperation",
+          "OperationNotAllowedOnIncrementalCopyBlob",
+          "PendingCopyOperation",
+          "PreviousSnapshotCannotBeNewer",
+          "PreviousSnapshotNotFound",
+          "PreviousSnapshotOperationNotSupported",
+          "SequenceNumberConditionNotMet",
+          "SequenceNumberIncrementTooLarge",
+          "SnapshotCountExceeded",
+          "SnaphotOperationRateExceeded",
+          "SnapshotsPresent",
+          "SourceConditionNotMet",
+          "SystemInUse",
+          "TargetConditionNotMet",
+          "UnauthorizedBlobOverwrite",
+          "BlobBeingRehydrated",
+          "BlobArchived",
+          "BlobNotArchived"
+        ],
+        "x-ms-enum": {
+          "name": "StorageErrorCode",
+          "modelAsString": true
+        }
+      },
+      "GeoReplication": {
+        "description": "Geo-Replication information for the Secondary Storage Service",
+        "type": "object",
+        "required": [
+          "Status",
+          "LastSyncTime"
+        ],
+        "properties": {
+          "Status": {
+            "description": "The status of the secondary location",
+            "type": "string",
+            "enum": [
+              "live",
+              "bootstrap",
+              "unavailable"
+            ],
+            "x-ms-enum": {
+              "name": "GeoReplicationStatusType",
+              "modelAsString": true
+            }
+          },
+          "LastSyncTime": {
+            "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
+            "type": "string",
+            "format": "date-time-rfc1123"
+          }
+        }
+      },
+      "Logging": {
+        "description": "Azure Analytics Logging settings.",
+        "type": "object",
+        "required": [
+          "Version",
+          "Delete",
+          "Read",
+          "Write",
+          "RetentionPolicy"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Delete": {
+            "description": "Indicates whether all delete requests should be logged.",
+            "type": "boolean"
+          },
+          "Read": {
+            "description": "Indicates whether all read requests should be logged.",
+            "type": "boolean"
+          },
+          "Write": {
+            "description": "Indicates whether all write requests should be logged.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "Metadata": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "string"
+        }
+      },
+      "Metrics": {
+        "description": "a summary of request statistics grouped by API in hour or minute aggregates for blobs",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Enabled": {
+            "description": "Indicates whether metrics are enabled for the Blob service.",
+            "type": "boolean"
+          },
+          "IncludeAPIs": {
+            "description": "Indicates whether metrics should generate summary statistics for called API operations.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "PageList": {
+        "description": "the list of pages",
+        "type": "object",
+        "properties": {
+          "PageRange": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/PageRange"
+            }
+          },
+          "ClearRange": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/ClearRange"
+            }
+          }
+        }
+      },
+      "PageRange": {
+        "type": "object",
+        "required": [
+          "Start",
+          "End"
+        ],
+        "properties": {
+          "Start": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "Start"
+            }
+          },
+          "End": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "End"
+            }
+          }
+        },
+        "xml": {
+          "name": "PageRange"
+        }
+      },
+      "ClearRange": {
+        "type": "object",
+        "required": [
+          "Start",
+          "End"
+        ],
+        "properties": {
+          "Start": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "Start"
+            }
+          },
+          "End": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "End"
+            }
+          }
+        },
+        "xml": {
+          "name": "ClearRange"
+        }
+      },
+      "RetentionPolicy": {
+        "description": "the retention policy which determines how long the associated data should persist",
+        "type": "object",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Enabled": {
+            "description": "Indicates whether a retention policy is enabled for the storage service",
+            "type": "boolean"
+          },
+          "Days": {
+            "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
+            "type": "integer",
+            "minimum": 1
+          }
+        }
+      },
+      "SignedIdentifier": {
+        "xml": {
+          "name": "SignedIdentifier"
+        },
+        "description": "signed identifier",
+        "type": "object",
+        "required": [
+          "Id",
+          "AccessPolicy"
+        ],
+        "properties": {
+          "Id": {
+            "type": "string",
+            "description": "a unique id"
+          },
+          "AccessPolicy": {
+            "$ref": "#/definitions/AccessPolicy"
+          }
+        }
+      },
+      "SignedIdentifiers": {
+        "description": "a collection of signed identifiers",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/SignedIdentifier"
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "SignedIdentifiers"
+        }
+      },
+      "StaticWebsite": {
+        "description": "The properties that enable an account to host a static website",
+        "type": "object",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Enabled": {
+            "description": "Indicates whether this account is hosting a static website",
+            "type": "boolean"
+          },
+          "IndexDocument": {
+            "description": "The default name of the index page under each directory",
+            "type": "string"
+          },
+          "ErrorDocument404Path": {
+            "description": "The absolute path of the custom 404 page",
+            "type": "string"
+          }
+        }
+      },
+      "StorageServiceProperties": {
+        "description": "Storage Service Properties.",
+        "type": "object",
+        "properties": {
+          "Logging": {
+            "$ref": "#/definitions/Logging"
+          },
+          "HourMetrics": {
+            "$ref": "#/definitions/Metrics"
+          },
+          "MinuteMetrics": {
+            "$ref": "#/definitions/Metrics"
+          },
+          "Cors": {
+            "description": "The set of CORS rules.",
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/CorsRule"
+            },
+            "xml": {
+              "wrapped": true
+            }
+          },
+          "DefaultServiceVersion": {
+            "description": "The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions",
+            "type": "string"
+          },
+          "DeleteRetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          },
+          "StaticWebsite": {
+            "$ref": "#/definitions/StaticWebsite"
+          }
+        }
+      },
+      "StorageServiceStats": {
+        "description": "Stats for the storage service.",
+        "type": "object",
+        "properties": {
+          "GeoReplication": {
+            "$ref": "#/definitions/GeoReplication"
+          }
+        }
+      }
+    },
+    "parameters": {
+      "Url": {
+        "name": "url",
+        "description": "The URL of the service account, container, or blob that is the targe of the desired operation.",
+        "required": true,
+        "type": "string",
+        "in": "path",
+        "x-ms-skip-url-encoding": true
+      },
+      "ApiVersionParameter": {
+        "name": "x-ms-version",
+        "x-ms-client-name": "version",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "description": "Specifies the version of the operation to use for this request.",
+        "enum": [
+          "2018-11-09"
+        ]
+      },
+      "Blob": {
+        "name": "blob",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "pattern": "^[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+)*(?:\\.[a-zA-Z0-9]+){0,1}$",
+        "minLength": 1,
+        "maxLength": 1024,
+        "x-ms-parameter-location": "method",
+        "description": "The blob name."
+      },
+      "BlobCacheControl": {
+        "name": "x-ms-blob-cache-control",
+        "x-ms-client-name": "blobCacheControl",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's cache control. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobConditionAppendPos": {
+        "name": "x-ms-blob-condition-appendpos",
+        "x-ms-client-name": "appendPosition",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "append-position-access-conditions"
+        },
+        "description": "Optional conditional header, used only for the Append Block operation. A number indicating the byte offset to compare. Append Block will succeed only if the append position is equal to this number. If it is not, the request will fail with the AppendPositionConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+      },
+      "BlobConditionMaxSize": {
+        "name": "x-ms-blob-condition-maxsize",
+        "x-ms-client-name": "maxSize",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "append-position-access-conditions"
+        },
+        "description": "Optional conditional header. The max length in bytes permitted for the append blob. If the Append Block operation would cause the blob to exceed that limit or if the blob size is already greater than the value specified in this header, the request will fail with MaxBlobSizeConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+      },
+      "BlobPublicAccess": {
+        "name": "x-ms-blob-public-access",
+        "x-ms-client-name": "access",
+        "in": "header",
+        "required": false,
+        "x-ms-parameter-location": "method",
+        "description": "Specifies whether data in the container may be accessed publicly and the level of access",
+        "type": "string",
+        "enum": [
+          "container",
+          "blob"
+        ],
+        "x-ms-enum": {
+          "name": "PublicAccessType",
+          "modelAsString": true
+        }
+      },
+      "AccessTier": {
+        "name": "x-ms-access-tier",
+        "x-ms-client-name": "tier",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "enum": [
+          "P4",
+          "P6",
+          "P10",
+          "P20",
+          "P30",
+          "P40",
+          "P50",
+          "Hot",
+          "Cool",
+          "Archive"
+        ],
+        "x-ms-enum": {
+          "name": "AccessTier",
+          "modelAsString": true
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Indicates the tier to be set on the blob."
+      },
+      "BlobContentDisposition": {
+        "name": "x-ms-blob-content-disposition",
+        "x-ms-client-name": "blobContentDisposition",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's Content-Disposition header."
+      },
+      "BlobContentEncoding": {
+        "name": "x-ms-blob-content-encoding",
+        "x-ms-client-name": "blobContentEncoding",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's content encoding. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobContentLanguage": {
+        "name": "x-ms-blob-content-language",
+        "x-ms-client-name": "blobContentLanguage",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Set the blob's content language. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobContentLengthOptional": {
+        "name": "x-ms-blob-content-length",
+        "x-ms-client-name": "blobContentLength",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+      },
+      "BlobContentLengthRequired": {
+        "name": "x-ms-blob-content-length",
+        "x-ms-client-name": "blobContentLength",
+        "in": "header",
+        "required": true,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+      },
+      "BlobContentMD5": {
+        "name": "x-ms-blob-content-md5",
+        "x-ms-client-name": "blobContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "byte",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded."
+      },
+      "BlobContentType": {
+        "name": "x-ms-blob-content-type",
+        "x-ms-client-name": "blobContentType",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's content type. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobSequenceNumber": {
+        "name": "x-ms-blob-sequence-number",
+        "x-ms-client-name": "blobSequenceNumber",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "default": 0,
+        "x-ms-parameter-location": "method",
+        "description": "Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1."
+      },
+      "BlockId": {
+        "name": "blockid",
+        "x-ms-client-name": "blockId",
+        "in": "query",
+        "type": "string",
+        "required": true,
+        "x-ms-parameter-location": "method",
+        "description": "A valid Base64 string value that identifies the block. Prior to encoding, the string must be less than or equal to 64 bytes in size. For a given blob, the length of the value specified for the blockid parameter must be the same size for each block."
+      },
+      "BlockListType": {
+        "name": "blocklisttype",
+        "x-ms-client-name": "listType",
+        "in": "query",
+        "required": true,
+        "default": "committed",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies whether to return the list of committed blocks, the list of uncommitted blocks, or both lists together.",
+        "type": "string",
+        "enum": [
+          "committed",
+          "uncommitted",
+          "all"
+        ],
+        "x-ms-enum": {
+          "name": "BlockListType",
+          "modelAsString": false
+        }
+      },
+      "Body": {
+        "name": "body",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "type": "object",
+          "format": "file"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Initial data"
+      },
+      "ContainerAcl": {
+        "name": "containerAcl",
+        "in": "body",
+        "schema": {
+          "$ref": "#/definitions/SignedIdentifiers"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "the acls for the container"
+      },
+      "CopyId": {
+        "name": "copyid",
+        "x-ms-client-name": "copyId",
+        "in": "query",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The copy identifier provided in the x-ms-copy-id header of the original Copy Blob operation."
+      },
+      "ClientRequestId": {
+        "name": "x-ms-client-request-id",
+        "x-ms-client-name": "requestId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "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."
+      },
+      "ContainerName": {
+        "name": "containerName",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The container name."
+      },
+  
+      "ContentLength": {
+        "name": "Content-Length",
+        "in": "header",
+        "required": true,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "The length of the request."
+      },
+      "ContentMD5": {
+        "name": "Content-MD5",
+        "x-ms-client-name": "transactionalContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "byte",
+        "x-ms-parameter-location": "method",
+        "description": "Specify the transactional md5 for the body, to be validated by the service."
+      },
+      "CopySource": {
+        "name": "x-ms-copy-source",
+        "x-ms-client-name": "copySource",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "format": "url",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature."
+      },
+      "DeleteSnapshots": {
+        "name": "x-ms-delete-snapshots",
+        "x-ms-client-name": "deleteSnapshots",
+        "description": "Required if the blob has associated snapshots. Specify one of the following two options: include: Delete the base blob and all of its snapshots. only: Delete only the blob's snapshots and not the blob itself",
+        "x-ms-parameter-location": "method",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "enum": [
+          "include",
+          "only"
+        ],
+        "x-ms-enum": {
+          "name": "DeleteSnapshotsOptionType",
+          "modelAsString": false
+        }
+      },
+      "Delimiter": {
+        "name": "delimiter",
+        "description": "When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.",
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "in": "query",
+        "required": true
+      },
+      "GetRangeContentMD5": {
+        "name": "x-ms-range-get-content-md5",
+        "x-ms-client-name": "rangeGetContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "boolean",
+        "x-ms-parameter-location": "method",
+        "description": "When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size."
+      },
+      "IfMatch": {
+        "name": "If-Match",
+        "x-ms-client-name": "ifMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs with a matching value."
+      },
+      "IfModifiedSince": {
+        "name": "If-Modified-Since",
+        "x-ms-client-name": "ifModifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+      },
+      "IfNoneMatch": {
+        "name": "If-None-Match",
+        "x-ms-client-name": "ifNoneMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs without a matching value."
+      },
+      "IfUnmodifiedSince": {
+        "name": "If-Unmodified-Since",
+        "x-ms-client-name": "ifUnmodifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+      },
+      "IfSequenceNumberEqualTo": {
+        "name": "x-ms-if-sequence-number-eq",
+        "x-ms-client-name": "ifSequenceNumberEqualTo",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "sequence-number-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has the specified sequence number."
+      },
+      "IfSequenceNumberLessThan": {
+        "name": "x-ms-if-sequence-number-lt",
+        "x-ms-client-name": "ifSequenceNumberLessThan",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "sequence-number-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has a sequence number less than the specified."
+      },
+      "IfSequenceNumberLessThanOrEqualTo": {
+        "name": "x-ms-if-sequence-number-le",
+        "x-ms-client-name": "ifSequenceNumberLessThanOrEqualTo",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "sequence-number-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has a sequence number less than or equal to the specified."
+      },
+      "KeyInfo": {
+        "name": "KeyInfo",
+        "in": "body",
+        "x-ms-parameter-location": "method",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/KeyInfo"
+        }
+      },
+      "ListBlobsInclude": {
+        "name": "include",
+        "in": "query",
+        "required": false,
+        "type": "array",
+        "collectionFormat": "csv",
+        "items": {
+          "type": "string",
+          "enum": [
+            "copy",
+            "deleted",
+            "metadata",
+            "snapshots",
+            "uncommittedblobs"
+          ],
+          "x-ms-enum": {
+            "name": "ListBlobsIncludeItem",
+            "modelAsString": false
+          }
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Include this parameter to specify one or more datasets to include in the response."
+      },
+      "ListContainersInclude": {
+        "name": "include",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "enum": [
+          "metadata"
+        ],
+        "x-ms-enum": {
+          "name": "ListContainersIncludeType",
+          "modelAsString": false
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Include this parameter to specify that the container's metadata be returned as part of the response body."
+      },
+      "LeaseBreakPeriod": {
+        "name": "x-ms-lease-break-period",
+        "x-ms-client-name": "breakPeriod",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "x-ms-parameter-location": "method",
+        "description": "For a break operation, proposed duration the lease should continue before it is broken, in seconds, between 0 and 60. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately."
+      },
+      "LeaseDuration": {
+        "name": "x-ms-lease-duration",
+        "x-ms-client-name": "duration",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change."
+      },
+      "LeaseIdOptional": {
+        "name": "x-ms-lease-id",
+        "x-ms-client-name": "leaseId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "lease-access-conditions"
+        },
+        "description": "If specified, the operation only succeeds if the resource's lease is active and matches this ID."
+      },
+      "LeaseIdRequired": {
+        "name": "x-ms-lease-id",
+        "x-ms-client-name": "leaseId",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the current lease ID on the resource."
+      },
+      "Marker": {
+        "name": "marker",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
+        "x-ms-parameter-location": "method"
+      },
+      "MaxResults": {
+        "name": "maxresults",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 1,
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
+      },
+      "Metadata": {
+        "name": "x-ms-meta",
+        "x-ms-client-name": "metadata",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.",
+        "x-ms-header-collection-prefix": "x-ms-meta-"
+      },
+      "Prefix": {
+        "name": "prefix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "Filters the results to return only containers whose name begins with the specified prefix.",
+        "x-ms-parameter-location": "method"
+      },
+      "PrevSnapshot": {
+        "name": "prevsnapshot",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Optional in version 2015-07-08 and newer. The prevsnapshot parameter is a DateTime value that specifies that the response will contain only pages that were changed between target blob and previous snapshot. Changed pages include both updated and cleared pages. The target blob may be a snapshot, as long as the snapshot specified by prevsnapshot is the older of the two. Note that incremental snapshots are currently supported only for blobs created on or after January 1, 2016."
+      },
+      "ProposedLeaseIdOptional": {
+        "name": "x-ms-proposed-lease-id",
+        "x-ms-client-name": "proposedLeaseId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+      },
+      "ProposedLeaseIdRequired": {
+        "name": "x-ms-proposed-lease-id",
+        "x-ms-client-name": "proposedLeaseId",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+      },
+      "Range": {
+        "name": "x-ms-range",
+        "x-ms-client-name": "range",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Return only the bytes of the blob in the specified range."
+      },
+      "RangeRequiredPutPageFromUrl": {
+        "name": "x-ms-range",
+        "x-ms-client-name": "range",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required."
+      },
+      "SequenceNumberAction": {
+        "name": "x-ms-sequence-number-action",
+        "x-ms-client-name": "sequenceNumberAction",
+        "in": "header",
+        "required": true,
+        "x-ms-parameter-location": "method",
+        "description": "Required if the x-ms-blob-sequence-number header is set for the request. This property applies to page blobs only. This property indicates how the service should modify the blob's sequence number",
+        "type": "string",
+        "enum": [
+          "max",
+          "update",
+          "increment"
+        ],
+        "x-ms-enum": {
+          "name": "SequenceNumberActionType",
+          "modelAsString": false
+        }
+      },
+      "Snapshot": {
+        "name": "snapshot",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob\">Creating a Snapshot of a Blob.</a>"
+      },
+      "SourceContentMD5": {
+        "name": "x-ms-source-content-md5",
+        "x-ms-client-name": "sourceContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "byte",
+        "x-ms-parameter-location": "method",
+        "description": "Specify the md5 calculated for the range of bytes that must be read from the copy source."
+      },
+      "SourceRange": {
+        "name": "x-ms-source-range",
+        "x-ms-client-name": "sourceRange",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Bytes of source data in the specified range."
+        },
+        "SourceRangeRequiredPutPageFromUrl": {
+          "name": "x-ms-source-range",
+          "x-ms-client-name": "sourceRange",
+          "in": "header",
+          "required": true,
+          "type": "string",
+          "x-ms-parameter-location": "method",
+          "description": "Bytes of source data in the specified range. The length of this range should match the ContentLength header and x-ms-range/Range destination range header."
+      },
+      "SourceIfMatch": {
+        "name": "x-ms-source-if-match",
+        "x-ms-client-name": "sourceIfMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs with a matching value."
+      },
+      "SourceIfModifiedSince": {
+        "name": "x-ms-source-if-modified-since",
+        "x-ms-client-name": "sourceIfModifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+      },
+      "SourceIfNoneMatch": {
+        "name": "x-ms-source-if-none-match",
+        "x-ms-client-name": "sourceIfNoneMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs without a matching value."
+      },
+      "SourceIfUnmodifiedSince": {
+        "name": "x-ms-source-if-unmodified-since",
+        "x-ms-client-name": "sourceIfUnmodifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+      },
+        "SourceLeaseId": {
+          "name": "x-ms-source-lease-id",
+          "x-ms-client-name": "sourceLeaseId",
+          "in": "header",
+          "required": false,
+          "type": "string",
+          "x-ms-parameter-location": "method",
+          "description": "A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match."
+        },
+      "SourceUrl": {
+        "name": "x-ms-copy-source",
+        "x-ms-client-name": "sourceUrl",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "format": "url",
+        "x-ms-parameter-location": "method",
+        "description": "Specify a URL to the copy source."
+      },
+      "StorageServiceProperties": {
+        "name": "StorageServiceProperties",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/StorageServiceProperties"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "The StorageService properties."
+      },
+      "Timeout": {
+        "name": "timeout",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 0,
+        "x-ms-parameter-location": "method",
+        "description": "The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations\">Setting Timeouts for Blob Service Operations.</a>"
+        }
+    }
+  }
+  
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/swagger/blob-2019-02-02.json b/sdk/storage/azure-storage-blob/swagger/blob-2019-02-02.json
new file mode 100644
index 000000000000..18ae16c45ec5
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/swagger/blob-2019-02-02.json
@@ -0,0 +1,9974 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Azure Blob Storage",
+    "version": "2019-02-02",
+    "x-ms-code-generation-settings": {
+      "header": "MIT",
+      "strictSpecAdherence": false
+    }
+  },
+  "x-ms-parameterized-host": {
+    "hostTemplate": "{url}",
+    "useSchemePrefix": false,
+    "positionInOperation": "first",
+    "parameters": [
+      {
+        "$ref": "#/parameters/Url"
+      }
+    ]
+  },
+  "securityDefinitions": {
+    "blob_shared_key": {
+      "type": "apiKey",
+      "name": "Authorization",
+      "in": "header"
+    }
+  },
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/xml",
+    "application/octet-stream",
+    "text/plain"
+  ],
+  "produces": [
+    "application/xml",
+    "application/octet-stream",
+    "text/plain"
+  ],
+  "paths": {},
+    "x-ms-paths": {
+        "/?restype=service&comp=properties": {
+            "put": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_SetProperties",
+                "description": "Sets properties for a storage account's Blob service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/StorageServiceProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "Success (Accepted)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetProperties",
+                "description": "gets the properties of a storage account's Blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageServiceProperties"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "service"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/?restype=service&comp=stats": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetStatistics",
+                "description": "Retrieves statistics related to replication for the Blob service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageServiceStats"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "service"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "stats"
+                    ]
+                }
+            ]
+        },
+        "/?comp=list": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_ListContainersSegment",
+                "description": "The List Containers Segment operation returns a list of the containers under the specified account",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Prefix"
+                    },
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/ListContainersInclude"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/ListContainersSegmentResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "NextMarker"
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "list"
+                    ]
+                }
+            ]
+        },
+        "/?restype=service&comp=userdelegationkey": {
+            "post": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetUserDelegationKey",
+                "description": "Retrieves a user delgation key for the Blob service. This is only a valid operation when using bearer token authentication.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/KeyInfo"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/UserDelegationKey"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "service"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "userdelegationkey"
+                    ]
+                }
+            ]
+        },
+        "/?restype=account&comp=properties": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetAccountInfo",
+                "description": "Returns the sku name and account kind ",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success (OK)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-sku-name": {
+                                "x-ms-client-name": "SkuName",
+                                "type": "string",
+                                "enum": [
+                                    "Standard_LRS",
+                                    "Standard_GRS",
+                                    "Standard_RAGRS",
+                                    "Standard_ZRS",
+                                    "Premium_LRS"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SkuName",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the sku name of the account"
+                            },
+                            "x-ms-account-kind": {
+                                "x-ms-client-name": "AccountKind",
+                                "type": "string",
+                                "enum": [
+                                    "Storage",
+                                    "BlobStorage",
+                                    "StorageV2"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "AccountKind",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the account kind"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "account"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/?comp=blobs": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_FilterBlobs",
+                "description": "The Filter Blobs operation enables callers to list blobs in an account whose tags match a given search expression.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagFilter"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Filter Blobs this is 'application/xml'"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/FilterBlobsResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "blobs"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_Create",
+                "description": "creates a new container under the specified account. If the container with the same name already exists, the operation fails",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobPublicAccess"
+                    },
+                    {
+                        "$ref": "#/parameters/DefaultEncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/DenyEncryptionScopeOverride"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "Success, Container created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_GetProperties",
+                "description": "returns all user-defined metadata and system properties for the specified container. The data returned does not include the container's list of blobs",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "headers": {
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-public-access": {
+                                "x-ms-client-name": "BlobPublicAccess",
+                                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                                "type": "string",
+                                "enum": [
+                                    "container",
+                                    "blob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "PublicAccessType",
+                                    "modelAsString": true
+                                }
+                            },
+                            "x-ms-default-encryption-scope": {
+                                "x-ms-client-name": "DefaultEncryptionScope",
+                                "type": "string",
+                                "description": "Default encryption scope on this container"
+                            },
+                            "x-ms-deny-encryption-scope-override": {
+                                "x-ms-client-name": "DenyEncryptionScopeOverride",
+                                "type": "boolean",
+                                "description": "Whether to reject the write request with encryption scope"
+                            },
+                            "x-ms-has-immutability-policy": {
+                                "x-ms-client-name": "HasImmutabilityPolicy",
+                                "description": "Indicates whether the container has an immutability policy set on it.",
+                                "type": "boolean"
+                            },
+                            "x-ms-has-legal-hold": {
+                                "x-ms-client-name": "HasLegalHold",
+                                "description": "Indicates whether the container has a legal hold.",
+                                "type": "boolean"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_Delete",
+                "description": "operation marks the specified container for deletion. The container and any blobs contained within it are later deleted during garbage collection",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "Accepted",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=metadata": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_SetMetadata",
+                "description": "operation sets one or more user-defined name-value pairs for the specified container.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "metadata"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=acl": {
+            "get": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_GetAccessPolicy",
+                "description": "gets the permissions for the specified container. The permissions indicate whether container data may be accessed publicly.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "headers": {
+                            "x-ms-blob-public-access": {
+                                "x-ms-client-name": "BlobPublicAccess",
+                                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                                "type": "string",
+                                "enum": [
+                                    "container",
+                                    "blob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "PublicAccessType",
+                                    "modelAsString": true
+                                }
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/SignedIdentifiers"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_SetAccessPolicy",
+                "description": "sets the permissions for the specified container. The permissions indicate whether blobs in a container may be accessed publicly.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ContainerAcl"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobPublicAccess"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "acl"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&acquire": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_AcquireLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseDuration"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The Acquire operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a container's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "acquire"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&release": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_ReleaseLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Release operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "release"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&renew": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_RenewLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Renew operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a container's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "renew"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&break": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_BreakLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseBreakPeriod"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The Break operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-time": {
+                                "x-ms-client-name": "LeaseTime",
+                                "type": "integer",
+                                "description": "Approximate time remaining in the lease period, in seconds."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "break"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&change": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_ChangeLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Change operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a container's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "change"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=list&flat": {
+            "get": {
+                "tags": [
+                    "containers"
+                ],
+                "operationId": "Container_ListBlobFlatSegment",
+                "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Prefix"
+                    },
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/ListBlobsInclude"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/ListBlobsFlatSegmentResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "NextMarker"
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "list"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=list&hierarchy": {
+            "get": {
+                "tags": [
+                    "containers"
+                ],
+                "operationId": "Container_ListBlobHierarchySegment",
+                "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Prefix"
+                    },
+                    {
+                        "$ref": "#/parameters/Delimiter"
+                    },
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/ListBlobsInclude"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/ListBlobsHierarchySegmentResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "NextMarker"
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "list"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=account&comp=properties": {
+            "get": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_GetAccountInfo",
+                "description": "Returns the sku name and account kind ",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success (OK)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-sku-name": {
+                                "x-ms-client-name": "SkuName",
+                                "type": "string",
+                                "enum": [
+                                    "Standard_LRS",
+                                    "Standard_GRS",
+                                    "Standard_RAGRS",
+                                    "Standard_ZRS",
+                                    "Premium_LRS"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SkuName",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the sku name of the account"
+                            },
+                            "x-ms-account-kind": {
+                                "x-ms-client-name": "AccountKind",
+                                "type": "string",
+                                "enum": [
+                                    "Storage",
+                                    "BlobStorage",
+                                    "StorageV2"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "AccountKind",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the account kind"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "account"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{filesystem}/{path}?resource=directory&Create": {
+            "put": {
+                "tags": [
+                    "directory"
+                ],
+                "operationId": "Directory_Create",
+                "description": "Create a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: \"*\".",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/DirectoryProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixPermissions"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixUmask"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The file or directory was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "An HTTP entity tag associated with the file or directory."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The data and time the file or directory was last modified. Write operations on the file or directory update the last modified time."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the resource in bytes."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "resource",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "directory"
+                    ]
+                }
+            ]
+        },
+        "/{filesystem}/{path}?DirectoryRename": {
+            "put": {
+                "tags": [
+                    "directory"
+                ],
+                "operationId": "Directory_Rename",
+                "description": "Rename a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests. For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations). To fail if the destination already exists, use a conditional request with If-None-Match: \"*\".",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Continuation"
+                    },
+                    {
+                        "$ref": "#/parameters/PathRenameMode"
+                    },
+                    {
+                        "$ref": "#/parameters/FileRenameSource"
+                    },
+                    {
+                        "$ref": "#/parameters/DirectoryProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixPermissions"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixUmask"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceLeaseId"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The directory was renamed.",
+                        "headers": {
+                            "x-ms-continuation": {
+                                "x-ms-client-name": "marker",
+                                "type": "string",
+                                "description": "When renaming a directory, the number of paths that are renamed with each invocation is limited. If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header. When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "An HTTP entity tag associated with the file or directory."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The data and time the file or directory was last modified. Write operations on the file or directory update the last modified time."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the resource in bytes."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{filesystem}/{path}?DirectoryDelete": {
+            "delete": {
+                "tags": [
+                    "directory"
+                ],
+                "operationId": "Directory_Delete",
+                "description": "Deletes the directory",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/RecursiveDirectoryDelete"
+                    },
+                    {
+                        "$ref": "#/parameters/Continuation"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The directory was deleted.",
+                        "headers": {
+                            "x-ms-continuation": {
+                                "x-ms-client-name": "marker",
+                                "type": "string",
+                                "description": "When renaming a directory, the number of paths that are renamed with each invocation is limited. If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header. When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{containerName}/{blob}": {
+            "get": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Download",
+                "description": "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/GetRangeContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/GetRangeContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Returns the content of the entire blob.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The number of bytes present in the response body."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                            },
+                            "Content-Range": {
+                                "type": "string",
+                                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "Content-Encoding": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Encoding request header"
+                            },
+                            "Cache-Control": {
+                                "type": "string",
+                                "description": "This header is returned if it was previously specified for the blob."
+                            },
+                            "Content-Disposition": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                            },
+                            "Content-Language": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Language request header."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-blob-type": {
+                                "x-ms-client-name": "BlobType",
+                                "description": "The blob's type.",
+                                "type": "string",
+                                "enum": [
+                                    "BlockBlob",
+                                    "PageBlob",
+                                    "AppendBlob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "BlobType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-copy-completion-time": {
+                                "x-ms-client-name": "CopyCompletionTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status-description": {
+                                "x-ms-client-name": "CopyStatusDescription",
+                                "type": "string",
+                                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-progress": {
+                                "x-ms-client-name": "CopyProgress",
+                                "type": "string",
+                                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-source": {
+                                "x-ms-client-name": "CopySource",
+                                "type": "string",
+                                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Accept-Ranges": {
+                                "type": "string",
+                                "description": "Indicates that the service supports requests for partial blob content."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            },
+                            "x-ms-blob-content-md5": {
+                                "x-ms-client-name": "BlobContentMD5",
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                            },
+                            "x-ms-tag-count": {
+                                "x-ms-client-name": "TagCount",
+                                "type": "integer",
+                                "description": "The number of tags corresponding to the blob."
+                            }
+                        },
+                        "schema": {
+                            "type": "object",
+                            "format": "file"
+                        }
+                    },
+                    "206": {
+                        "description": "Returns the content of a specified range of the blob.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The number of bytes present in the response body."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                            },
+                            "Content-Range": {
+                                "type": "string",
+                                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "Content-Encoding": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Encoding request header"
+                            },
+                            "Cache-Control": {
+                                "type": "string",
+                                "description": "This header is returned if it was previously specified for the blob."
+                            },
+                            "Content-Disposition": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                            },
+                            "Content-Language": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Language request header."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-blob-type": {
+                                "x-ms-client-name": "BlobType",
+                                "description": "The blob's type.",
+                                "type": "string",
+                                "enum": [
+                                    "BlockBlob",
+                                    "PageBlob",
+                                    "AppendBlob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "BlobType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-content-crc64": {
+                                "x-ms-client-name": "ContentCrc64",
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the request is to read a specified range and the x-ms-range-get-content-crc64 is set to true, then the request returns a crc64 for the range, as long as the range size is less than or equal to 4 MB. If both x-ms-range-get-content-crc64 & x-ms-range-get-content-md5 is specified in the same request, it will fail with 400(Bad Request)"
+                            },
+                            "x-ms-copy-completion-time": {
+                                "x-ms-client-name": "CopyCompletionTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status-description": {
+                                "x-ms-client-name": "CopyStatusDescription",
+                                "type": "string",
+                                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-progress": {
+                                "x-ms-client-name": "CopyProgress",
+                                "type": "string",
+                                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-source": {
+                                "x-ms-client-name": "CopySource",
+                                "type": "string",
+                                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Accept-Ranges": {
+                                "type": "string",
+                                "description": "Indicates that the service supports requests for partial blob content."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                            },
+                            "x-ms-blob-content-md5": {
+                                "x-ms-client-name": "BlobContentMD5",
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                            },
+                            "x-ms-tag-count": {
+                                "x-ms-client-name": "TagCount",
+                                "type": "integer",
+                                "description": "The number of tags corresponding to the blob."
+                            }
+                        },
+                        "schema": {
+                            "type": "object",
+                            "format": "file"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "head": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_GetProperties",
+                "description": "The Get Properties operation returns all user-defined metadata, standard HTTP properties, and system properties for the blob. It does not return the content of the blob.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Returns the properties of the blob.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-creation-time": {
+                                "x-ms-client-name": "CreationTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was created."
+                            },
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "x-ms-blob-type": {
+                                "x-ms-client-name": "BlobType",
+                                "description": "The blob's type.",
+                                "type": "string",
+                                "enum": [
+                                    "BlockBlob",
+                                    "PageBlob",
+                                    "AppendBlob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "BlobType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-copy-completion-time": {
+                                "x-ms-client-name": "CopyCompletionTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status-description": {
+                                "x-ms-client-name": "CopyStatusDescription",
+                                "type": "string",
+                                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-progress": {
+                                "x-ms-client-name": "CopyProgress",
+                                "type": "string",
+                                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-source": {
+                                "x-ms-client-name": "CopySource",
+                                "type": "string",
+                                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-incremental-copy": {
+                                "x-ms-client-name": "IsIncrementalCopy",
+                                "type": "boolean",
+                                "description": "Included if the blob is incremental copy blob."
+                            },
+                            "x-ms-copy-destination-snapshot": {
+                                "x-ms-client-name": "DestinationSnapshot",
+                                "type": "string",
+                                "description": "Included if the blob is incremental copy blob or incremental copy snapshot, if x-ms-copy-status is success. Snapshot time of the last successful incremental copy snapshot for this blob."
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The number of bytes present in the response body."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The content type specified for the blob. The default content type is 'application/octet-stream'"
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "Content-Encoding": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Encoding request header"
+                            },
+                            "Content-Disposition": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                            },
+                            "Content-Language": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Language request header."
+                            },
+                            "Cache-Control": {
+                                "type": "string",
+                                "description": "This header is returned if it was previously specified for the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+               	            "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "Accept-Ranges": {
+                                "type": "string",
+                                "description": "Indicates that the service supports requests for partial blob content."
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the metadata. This header is only returned when the metadata was encrypted with customer specified encryption."
+                            },
+                            "x-ms-access-tier": {
+                                "x-ms-client-name": "AccessTier",
+                                "type": "string",
+                                "description": "The tier of page blob on a premium storage account or tier of block blob on blob storage LRS accounts. For a list of allowed premium page blob tiers, see https://docs.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features. For blob storage LRS accounts, valid values are Hot/Cool/Archive."
+                            },
+                            "x-ms-access-tier-inferred": {
+                                "x-ms-client-name": "AccessTierInferred",
+                                "type": "boolean",
+                                "description": "For page blobs on a premium storage account only. If the access tier is not explicitly set on the blob, the tier is inferred based on its content length and this header will be returned with true value."
+                            },
+                            "x-ms-archive-status": {
+                                "x-ms-client-name": "ArchiveStatus",
+                                "type": "string",
+                                "description": "For blob storage LRS accounts, valid values are rehydrate-pending-to-hot/rehydrate-pending-to-cool. If the blob is being rehydrated and is not complete then this header is returned indicating that rehydrate is pending and also tells the destination tier."
+                            },
+                            "x-ms-access-tier-change-time": {
+                                "x-ms-client-name": "AccessTierChangeTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The time the tier was changed on the object. This is only returned if the tier on the block blob was ever set."
+                            },
+                            "x-ms-tag-count": {
+                                "x-ms-client-name": "TagCount",
+                                "type": "integer",
+                                "description": "The number of tags corresponding to the blob."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Delete",
+                "description": "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound). If the storage account's automatic snapshot feature is enabled, then, when a blob is deleted, an automatic snapshot is created. The blob becomes inaccessible immediately. All other operations on the blob causes the service to return an HTTP status code of 404 (ResourceNotFound). You can access automatic snapshot using snapshot timestamp or version id. You can restore the blob by calling Put or Copy Blob API with automatic snapshot as source. Deleting automatic snapshot requires shared key or special SAS/RBAC permissions.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/DeleteSnapshots"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The delete request was accepted and the blob will be deleted.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{filesystem}/{path}?FileRename": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Rename",
+                "description": "Rename a blob/file.  By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken.  This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: \"*\".",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/PathRenameMode"
+                    },
+                    {
+                        "$ref": "#/parameters/FileRenameSource"
+                    },
+                    {
+                        "$ref": "#/parameters/DirectoryProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixPermissions"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixUmask"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceLeaseId"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The file was renamed.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "An HTTP entity tag associated with the file or directory."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The data and time the file or directory was last modified.  Write operations on the file or directory update the last modified time."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the resource in bytes."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{containerName}/{blob}?PageBlob": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "PageBlob_Create",
+                "description": "The Create operation creates a new page blob.",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLengthRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobSequenceNumber"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The blob was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-blob-type",
+                    "x-ms-client-name": "blobType",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+                    "type": "string",
+                    "enum": [
+                        "PageBlob"
+                    ],
+                    "x-ms-enum": {
+                        "name": "BlobType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?AppendBlob": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "AppendBlob_Create",
+                "description": "The Create Append Blob operation creates a new append blob.",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The blob was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-blob-type",
+                    "x-ms-client-name": "blobType",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+                    "type": "string",
+                    "enum": [
+                        "AppendBlob"
+                    ],
+                    "x-ms-enum": {
+                        "name": "BlobType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?BlockBlob": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "BlockBlob_Upload",
+                "description": "The Upload Block Blob operation updates the content of an existing block blob. Updating an existing block blob overwrites any existing metadata on the blob. Partial updates are not supported with Put Blob; the content of the existing blob is overwritten with the content of the new blob. To perform a partial update of the content of a block blob, use the Put Block List operation.",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The blob was updated.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-blob-type",
+                    "x-ms-client-name": "blobType",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+                    "type": "string",
+                    "enum": [
+                        "BlockBlob"
+                    ],
+                    "x-ms-enum": {
+                        "name": "BlobType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=undelete": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Undelete",
+                "description": "Undelete a blob that was previously soft deleted",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The blob was undeleted successfully.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "undelete"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=properties&SetHTTPHeaders": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_SetHTTPHeaders",
+                "description": "The Set HTTP Headers operation sets system properties on the blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The properties were set successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=metadata": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_SetMetadata",
+                "description": "The Set Blob Metadata operation sets user-defined metadata for the specified blob as one or more name-value pairs",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The metadata was set successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the metadata. This header is only returned when the when the metadata was with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "metadata"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&acquire": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_AcquireLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseDuration"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The Acquire operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a blobs's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "acquire"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&release": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_ReleaseLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Release operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "release"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&renew": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_RenewLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Renew operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a blobs's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "renew"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&change": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_ChangeLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Change operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a blobs's lease"
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "change"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&break": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_BreakLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseBreakPeriod"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The Break operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-time": {
+                                "x-ms-client-name": "LeaseTime",
+                                "type": "integer",
+                                "description": "Approximate time remaining in the lease period, in seconds."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "break"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=snapshot": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_CreateSnapshot",
+                "description": "The Create Snapshot operation creates a read-only snapshot of a blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The snaptshot was taken successfully.",
+                        "headers": {
+                            "x-ms-snapshot": {
+                                "x-ms-client-name": "Snapshot",
+                                "type": "string",
+                                "description": "Uniquely identifies the snapshot and indicates the snapshot version. It may be used in subsequent requests to access the snapshot"
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "True if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise. For a snapshot request, this header is set to true when metadata was provided in the request and encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the source blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the source blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "snapshot"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=copy": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_StartCopyFromURL",
+                "description": "The Start Copy From URL operation copies a blob or an internet resource to a new blob.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+          },
+          {
+            "$ref": "#/parameters/RehydratePriority"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/CopySource"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The copy blob has been accepted with the specified copy status.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": []
+        },
+        "/{containerName}/{blob}?comp=copy&sync": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_CopyFromURL",
+                "description": "The Copy From URL operation copies a blob or an internet resource to a new blob. It will not return a response until the copy is complete.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/CopySource"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The copy has completed.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "success"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SyncCopyStatusType",
+                                    "modelAsString": false
+                                }
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-requires-sync",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "true"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=copy&copyid={CopyId}": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_AbortCopyFromURL",
+                "description": "The Abort Copy From URL operation aborts a pending Copy From URL operation, and leaves a destination blob with zero length and full metadata.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/CopyId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "The delete request was accepted and the blob will be deleted.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "copy"
+                    ]
+                },
+                {
+                    "name": "x-ms-copy-action",
+                    "x-ms-client-name": "copyActionAbortConstant",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "abort"
+                    ],
+                    "x-ms-parameter-location": "method"
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=tier": {
+            "put": {
+                "tags": [
+                    "blobs"
+                ],
+                "operationId": "Blob_SetTier",
+                "description": "The Set Tier operation sets the tier on a blob. The operation is allowed on a page blob in a premium storage account and on a block blob in a blob storage account (locally redundant storage only). A premium page blob's tier determines the allowed size, IOPS, and bandwidth of the blob. A block blob's tier determines Hot/Cool/Archive storage type. This operation does not update the blob's ETag.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierRequired"
+          },
+          {
+            "$ref": "#/parameters/RehydratePriority"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The new tier will take effect immediately.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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 newer."
+                            }
+                        }
+                    },
+                    "202": {
+                        "description": "The transition to the new tier is pending.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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 newer."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "tier"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?restype=account&comp=properties": {
+            "get": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_GetAccountInfo",
+                "description": "Returns the sku name and account kind ",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success (OK)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-sku-name": {
+                                "x-ms-client-name": "SkuName",
+                                "type": "string",
+                                "enum": [
+                                    "Standard_LRS",
+                                    "Standard_GRS",
+                                    "Standard_RAGRS",
+                                    "Standard_ZRS",
+                                    "Premium_LRS"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SkuName",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the sku name of the account"
+                            },
+                            "x-ms-account-kind": {
+                                "x-ms-client-name": "AccountKind",
+                                "type": "string",
+                                "enum": [
+                                    "Storage",
+                                    "BlobStorage",
+                                    "StorageV2"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "AccountKind",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the account kind"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "account"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=tags": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_SetTags",
+                "description": "The Set Blob Tags operation sets tags for the specified blob. This API is only supported in version 2018-11-09 and later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/BlobTagsBody"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "The tags were set.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_GetTags",
+                "description": "The Get Blob Tags operation returns all tags for the specified blob, snapshot, or version.  This API is only supported in version 2018-11-09 and later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Returns the tags.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/BlobTags"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "tags"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=block": {
+            "put": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_StageBlock",
+                "description": "The Stage Block operation creates a new block to be committed as part of a blob",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/BlockId"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the block. This header is only returned when the block was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=block&fromURL": {
+            "put": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_StageBlockFromURL",
+                "description": "The Stage Block operation creates a new block to be committed as part of a blob where the contents are read from a URL.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/BlockId"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceRange"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the block. This header is only returned when the block was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=blocklist": {
+            "put": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_CommitBlockList",
+                "description": "The Commit Block List operation writes a blob by specifying the list of block IDs that make up the blob. In order to be written as part of a blob, a block must have been successfully written to the server in a prior Put Block operation. You can call Put Block List to update a blob by uploading only those blocks that have changed, then committing the new and existing blocks together. You can do this by specifying whether to commit a block from the committed block list or from the uncommitted block list, or to commit the most recently uploaded version of the block, whichever list it may belong to.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "name": "blocks",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/BlockLookupList"
+                        }
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block list was recorded.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. This header refers to the content of the request, meaning, in this case, the list of blocks, and not the content of the blob itself."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. This header refers to the content of the request, meaning, in this case, the list of blocks, and not the content of the blob itself."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_GetBlockList",
+                "description": "The Get Block List operation retrieves the list of blocks that have been uploaded as part of a block blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/BlockListType"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The page range was written.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Get Block List this is 'application/xml'"
+                            },
+                            "x-ms-blob-content-length": {
+                                "x-ms-client-name": "BlobContentLength",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the blob in bytes."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/BlockList"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "blocklist"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=page&update": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_UploadPages",
+                "description": "The Upload Pages operation writes a range of pages to a page blob",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThan"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The page range was written.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for the page blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the pages. This header is only returned when the pages were encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the pages. This header is only returned when the pages were encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "page"
+                    ]
+                },
+                {
+                    "name": "x-ms-page-write",
+                    "x-ms-client-name": "pageWrite",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+                    "type": "string",
+                    "enum": [
+                        "update"
+                    ],
+                    "x-ms-enum": {
+                        "name": "PageWriteType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=page&clear": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_ClearPages",
+                "description": "The Clear Pages operation clears a set of pages from a page blob",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThan"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The page range was cleared.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for the page blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "page"
+                    ]
+                },
+                {
+                    "name": "x-ms-page-write",
+                    "x-ms-client-name": "pageWrite",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+                    "type": "string",
+                    "enum": [
+                        "clear"
+                    ],
+                    "x-ms-enum": {
+                        "name": "PageWriteType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=page&update&fromUrl": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_UploadPagesFromURL",
+                "description": "The Upload Pages operation writes a range of pages to a page blob where the contents are read from a URL",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/SourceUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceRangeRequiredPutPageFromUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/RangeRequiredPutPageFromUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThan"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The page range was written.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for the page blob."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "page"
+                    ]
+                },
+                {
+                    "name": "x-ms-page-write",
+                    "x-ms-client-name": "pageWrite",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+                    "type": "string",
+                    "enum": [
+                        "update"
+                    ],
+                    "x-ms-enum": {
+                        "name": "PageWriteType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=pagelist": {
+            "get": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_GetPageRanges",
+                "description": "The Get Page Ranges operation returns the list of valid page ranges for a page blob, version or snapshot of a page blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Information on the page blob was found.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "x-ms-blob-content-length": {
+                                "x-ms-client-name": "BlobContentLength",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the blob in bytes."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/PageList"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "pagelist"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=pagelist&diff": {
+            "get": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_GetPageRangesDiff",
+                "description": "[Update] The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot or version.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/PrevSnapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Information on the page blob was found.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "x-ms-blob-content-length": {
+                                "x-ms-client-name": "BlobContentLength",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the blob in bytes."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/PageList"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "pagelist"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=properties&Resize": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_Resize",
+                "description": "Resize the Blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLengthRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Blob was resized successfully",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=properties&UpdateSequenceNumber": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_UpdateSequenceNumber",
+                "description": "Update the sequence number of the blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SequenceNumberAction"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobSequenceNumber"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The sequence numbers were updated successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=incrementalcopy": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_CopyIncremental",
+                "description": "The Copy Incremental operation copies a snapshot of the source page blob to a destination page blob. The snapshot is copied such that only the differential changes between the previously copied snapshot are transferred to the destination. The copied snapshots are complete copies of the original snapshot and can be read or copied from as usual. This API is supported since REST version 2016-05-31.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/CopySource"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The blob was copied.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "incrementalcopy"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=appendblock": {
+            "put": {
+                "tags": [
+                    "appendblob"
+                ],
+                "operationId": "AppendBlob_AppendBlock",
+                "description": "The Append Block operation commits a new block of data to the end of an existing append blob. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionMaxSize"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionAppendPos"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-append-offset": {
+                                "x-ms-client-name": "BlobAppendOffset",
+                                "type": "string",
+                                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the block. This header is only returned when the block was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "appendblock"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=appendblock&fromUrl": {
+            "put": {
+                "tags": [
+                    "appendblob"
+                ],
+                "operationId": "AppendBlob_AppendBlockFromUrl",
+                "description": "The Append Block operation commits a new block of data to the end of an existing append blob where the contents are read from a source url. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/SourceUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceRange"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionMaxSize"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionAppendPos"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "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."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-append-offset": {
+                                "x-ms-client-name": "BlobAppendOffset",
+                                "type": "string",
+                                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "appendblock"
+                    ]
+                }
+            ]
+        }
+    },
+  "definitions": {
+    "KeyInfo": {
+      "type": "object",
+      "required": [
+        "Start",
+        "Expiry"
+      ],
+      "description": "Key information",
+      "properties": {
+        "Start": {
+          "description": "The date-time the key is active in ISO 8601 UTC time",
+          "type": "string"
+        },
+        "Expiry": {
+          "description": "The date-time the key expires in ISO 8601 UTC time",
+          "type": "string"
+        }
+      }
+    },
+    "UserDelegationKey": {
+      "type": "object",
+      "required": [
+        "SignedOid",
+        "SignedTid",
+        "SignedStart",
+        "SignedExpiry",
+        "SignedService",
+        "SignedVersion",
+        "Value"
+      ],
+      "description": "A user delegation key",
+      "properties": {
+        "SignedOid": {
+          "description": "The Azure Active Directory object ID in GUID format.",
+          "type": "string"
+        },
+        "SignedTid": {
+          "description": "The Azure Active Directory tenant ID in GUID format",
+          "type": "string"
+        },
+        "SignedStart": {
+          "description": "The date-time the key is active",
+          "type": "string",
+          "format": "date-time"
+        },
+        "SignedExpiry": {
+          "description": "The date-time the key expires",
+          "type": "string",
+          "format": "date-time"
+        },
+        "SignedService": {
+          "description": "Abbreviation of the Azure Storage service that accepts the key",
+          "type": "string"
+        },
+        "SignedVersion": {
+          "description": "The service version that created the key",
+          "type": "string"
+        },
+        "Value": {
+          "description": "The key as a base64 string",
+          "type": "string"
+        }
+      }
+    },
+    "PublicAccessType": {
+      "type": "string",
+      "enum": [
+        "container",
+        "blob"
+      ],
+      "x-ms-enum": {
+        "name": "PublicAccessType",
+        "modelAsString": true
+      }
+    },
+    "CopyStatus": {
+      "type": "string",
+      "enum": [
+        "pending",
+        "success",
+        "aborted",
+        "failed"
+      ],
+      "x-ms-enum": {
+        "name": "CopyStatusType",
+        "modelAsString": false
+      }
+    },
+    "LeaseDuration": {
+      "type": "string",
+      "enum": [
+        "infinite",
+        "fixed"
+      ],
+      "x-ms-enum": {
+        "name": "LeaseDurationType",
+        "modelAsString": false
+      }
+    },
+    "LeaseState": {
+      "type": "string",
+      "enum": [
+        "available",
+        "leased",
+        "expired",
+        "breaking",
+        "broken"
+      ],
+      "x-ms-enum": {
+        "name": "LeaseStateType",
+        "modelAsString": false
+      }
+    },
+    "LeaseStatus": {
+      "type": "string",
+      "enum": [
+        "locked",
+        "unlocked"
+      ],
+      "x-ms-enum": {
+        "name": "LeaseStatusType",
+        "modelAsString": false
+      }
+    },
+    "StorageError": {
+      "type": "object",
+      "properties": {
+        "Message": {
+          "type": "string"
+        }
+      }
+    },
+    "DataLakeStorageError": {
+      "type": "object",
+      "properties": {
+        "error": {
+          "description": "The service error response object.",
+          "properties": {
+            "code": {
+              "description": "The service error code.",
+              "type": "string"
+            },
+            "message": {
+              "description": "The service error message.",
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "AccessPolicy": {
+      "type": "object",
+      "required": [
+        "Start",
+        "Expiry",
+        "Permission"
+      ],
+      "description": "An Access policy",
+      "properties": {
+        "Start": {
+          "description": "the date-time the policy is active",
+          "type": "string",
+          "format": "date-time"
+        },
+        "Expiry": {
+          "description": "the date-time the policy expires",
+          "type": "string",
+          "format": "date-time"
+        },
+        "Permission": {
+          "description": "the permissions for the acl policy",
+          "type": "string"
+        }
+      }
+    },
+    "AccessTier": {
+      "type": "string",
+      "enum": [
+        "P4",
+        "P6",
+        "P10",
+        "P20",
+        "P30",
+        "P40",
+        "P50",
+        "Hot",
+        "Cool",
+        "Archive"
+      ],
+      "x-ms-enum": {
+        "name": "AccessTier",
+        "modelAsString": true
+      }
+    },
+    "ArchiveStatus": {
+      "type": "string",
+      "enum": [
+        "rehydrate-pending-to-hot",
+        "rehydrate-pending-to-cool"
+      ],
+      "x-ms-enum": {
+        "name": "ArchiveStatus",
+        "modelAsString": true
+      }
+    },
+    "BlobItem": {
+      "xml": {
+        "name": "Blob"
+      },
+      "description": "An Azure Storage blob",
+      "type": "object",
+      "required": [
+        "Name",
+        "Deleted",
+        "Snapshot",
+        "VersionId",
+        "Properties"
+      ],
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Deleted": {
+          "type": "boolean"
+        },
+        "Snapshot": {
+          "type": "string"
+        },
+        "VersionId": {
+          "type": "string"
+        },
+        "Properties": {
+          "$ref": "#/definitions/BlobProperties"
+        },
+        "Metadata": {
+          "$ref": "#/definitions/BlobMetadata"
+        },
+        "Tags": {
+          "$ref": "#/definitions/BlobTags"
+        }
+      }
+    },
+    "BlobProperties": {
+      "xml": {
+        "name": "Properties"
+      },
+      "description": "Properties of a blob",
+      "type": "object",
+      "required": [
+        "Etag",
+        "Last-Modified",
+        "TagCount"
+      ],
+      "properties": {
+        "Creation-Time": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "Last-Modified": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "Etag": {
+          "type": "string",
+          "format": "etag"
+        },
+        "Content-Length": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Size in bytes"
+        },
+        "Content-Type": {
+          "type": "string"
+        },
+        "Content-Encoding": {
+          "type": "string"
+        },
+        "Content-Language": {
+          "type": "string"
+        },
+        "Content-MD5": {
+          "type": "string",
+          "format": "byte"
+        },
+        "Content-Disposition": {
+          "type": "string"
+        },
+        "Cache-Control": {
+          "type": "string"
+        },
+        "x-ms-blob-sequence-number": {
+          "x-ms-client-name": "blobSequenceNumber",
+          "type": "integer",
+          "format": "int64"
+        },
+        "BlobType": {
+          "type": "string",
+          "enum": [
+            "BlockBlob",
+            "PageBlob",
+            "AppendBlob"
+          ],
+          "x-ms-enum": {
+            "name": "BlobType",
+            "modelAsString": false
+          }
+        },
+        "LeaseStatus": {
+          "$ref": "#/definitions/LeaseStatus"
+        },
+        "LeaseState": {
+          "$ref": "#/definitions/LeaseState"
+        },
+        "LeaseDuration": {
+          "$ref": "#/definitions/LeaseDuration"
+        },
+        "CopyId": {
+          "type": "string"
+        },
+        "CopyStatus": {
+          "$ref": "#/definitions/CopyStatus"
+        },
+        "CopySource": {
+          "type": "string"
+        },
+        "CopyProgress": {
+          "type": "string"
+        },
+        "CopyCompletionTime": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "CopyStatusDescription": {
+          "type": "string"
+        },
+        "ServerEncrypted": {
+          "type": "boolean"
+        },
+        "IncrementalCopy": {
+          "type": "boolean"
+        },
+        "DestinationSnapshot": {
+          "type": "string"
+        },
+        "DeletedTime": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "RemainingRetentionDays": {
+          "type": "integer"
+        },
+        "AccessTier": {
+          "$ref": "#/definitions/AccessTier"
+        },
+        "AccessTierInferred": {
+          "type": "boolean"
+        },
+        "ArchiveStatus": {
+          "$ref": "#/definitions/ArchiveStatus"
+        },
+        "CustomerProvidedKeySha256": {
+          "type": "string"
+        },
+        "EncryptionScope": {
+          "type": "string"
+        },
+        "AccessTierChangeTime": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "TagCount": {
+          "type": "integer",
+          "description": "The number of tags corresponding to the blob."
+        }
+      }
+    },
+    "ListBlobsFlatSegmentResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of blobs",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "ContainerName",
+        "Segment"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "ContainerName": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Prefix": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "Delimiter": {
+          "type": "string"
+        },
+        "Segment": {
+          "$ref": "#/definitions/BlobFlatListSegment"
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "ListBlobsHierarchySegmentResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of blobs",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "ContainerName",
+        "Segment"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "ContainerName": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Prefix": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "Delimiter": {
+          "type": "string"
+        },
+        "Segment": {
+          "$ref": "#/definitions/BlobHierarchyListSegment"
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "BlobFlatListSegment": {
+      "xml": {
+        "name": "Blobs"
+      },
+      "required": [
+        "BlobItems"
+      ],
+      "type": "object",
+      "properties": {
+        "BlobItems": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlobItem"
+          }
+        }
+      }
+    },
+    "BlobHierarchyListSegment": {
+      "xml": {
+        "name": "Blobs"
+      },
+      "type": "object",
+      "required": [
+        "BlobItems"
+      ],
+      "properties": {
+        "BlobPrefixes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlobPrefix"
+          }
+        },
+        "BlobItems": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlobItem"
+          }
+        }
+      }
+    },
+    "BlobPrefix": {
+      "type": "object",
+      "required": [
+        "Name"
+      ],
+      "properties": {
+        "Name": {
+          "type": "string"
+        }
+      }
+    },
+    "Tag": {
+      "type": "object",
+      "required": [
+        "Key",
+        "Value"
+      ],
+      "description": "Represents a single user-provided tag.",
+      "properties": {
+        "Key": {
+          "description": "The tag name.",
+          "type": "string"
+        },
+        "Value": {
+          "description": "The tag value.",
+          "type": "string"
+        }
+      }
+    },
+    "BlobTags": {
+      "xml": {
+        "name": "Tags"
+      },
+      "description": "XML containing key/value pairs representing the tags for the blob.",
+      "properties": {
+        "TagSet": {
+          "xml": {
+            "wrapped": true
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Tag"
+          }
+        }
+      }
+    },
+    "Block": {
+      "type": "object",
+      "required": [
+        "Name",
+        "Size"
+      ],
+      "description": "Represents a single block in a block blob.  It describes the block's ID and size.",
+      "properties": {
+        "Name": {
+          "description": "The base64 encoded block ID.",
+          "type": "string"
+        },
+        "Size": {
+          "description": "The block size in bytes.",
+          "type": "integer"
+        }
+      }
+    },
+    "BlockList": {
+      "type": "object",
+      "properties": {
+        "CommittedBlocks": {
+          "xml": {
+            "wrapped": true
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Block"
+          }
+        },
+        "UncommittedBlocks": {
+          "xml": {
+            "wrapped": true
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Block"
+          }
+        }
+      }
+    },
+    "BlockLookupList": {
+      "type": "object",
+      "properties": {
+        "Committed": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "xml": {
+              "name": "Committed"
+            }
+          }
+        },
+        "Uncommitted": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "xml": {
+              "name": "Uncommitted"
+            }
+          }
+        },
+        "Latest": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "xml": {
+              "name": "Latest"
+            }
+          }
+        }
+      },
+      "xml": {
+        "name": "BlockList"
+      }
+    },
+    "ContainerItem": {
+      "xml": {
+        "name": "Container"
+      },
+      "type": "object",
+      "required": [
+        "Name",
+        "Properties"
+      ],
+      "description": "An Azure Storage container",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Properties": {
+          "$ref": "#/definitions/ContainerProperties"
+        },
+        "Metadata": {
+          "$ref": "#/definitions/ContainerMetadata"
+        }
+      }
+    },
+    "ContainerProperties": {
+      "type": "object",
+      "required": [
+        "Last-Modified",
+        "Etag"
+      ],
+      "description": "Properties of a container",
+      "properties": {
+        "Last-Modified": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "Etag": {
+          "type": "string",
+          "format": "etag"
+        },
+        "LeaseStatus": {
+          "$ref": "#/definitions/LeaseStatus"
+        },
+        "LeaseState": {
+          "$ref": "#/definitions/LeaseState"
+        },
+        "LeaseDuration": {
+          "$ref": "#/definitions/LeaseDuration"
+        },
+        "PublicAccess": {
+          "$ref": "#/definitions/PublicAccessType"
+        },
+        "HasImmutabilityPolicy": {
+          "type": "boolean"
+        },
+        "HasLegalHold": {
+          "type": "boolean"
+        }
+      }
+    },
+    "ListContainersSegmentResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of containers",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "ContainerItems"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Prefix": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "ContainerItems": {
+          "xml": {
+            "wrapped": true,
+            "name": "Containers"
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ContainerItem"
+          }
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "CorsRule": {
+      "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
+      "type": "object",
+      "required": [
+        "AllowedOrigins",
+        "AllowedMethods",
+        "AllowedHeaders",
+        "ExposedHeaders",
+        "MaxAgeInSeconds"
+      ],
+      "properties": {
+        "AllowedOrigins": {
+          "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
+          "type": "string"
+        },
+        "AllowedMethods": {
+          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
+          "type": "string"
+        },
+        "AllowedHeaders": {
+          "description": "the request headers that the origin domain may specify on the CORS request.",
+          "type": "string"
+        },
+        "ExposedHeaders": {
+          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
+          "type": "string"
+        },
+        "MaxAgeInSeconds": {
+          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "ErrorCode": {
+      "description": "Error codes returned by the service",
+      "type": "string",
+      "enum": [
+        "AccountAlreadyExists",
+        "AccountBeingCreated",
+        "AccountIsDisabled",
+        "AuthenticationFailed",
+        "ConditionHeadersNotSupported",
+        "ConditionNotMet",
+        "EmptyMetadataKey",
+        "InsufficientAccountPermissions",
+        "InternalError",
+        "InvalidAuthenticationInfo",
+        "InvalidHeaderValue",
+        "InvalidHttpVerb",
+        "InvalidInput",
+        "InvalidMd5",
+        "InvalidMetadata",
+        "InvalidQueryParameterValue",
+        "InvalidRange",
+        "InvalidResourceName",
+        "InvalidUri",
+        "InvalidXmlDocument",
+        "InvalidXmlNodeValue",
+        "Md5Mismatch",
+        "MetadataTooLarge",
+        "MissingContentLengthHeader",
+        "MissingRequiredQueryParameter",
+        "MissingRequiredHeader",
+        "MissingRequiredXmlNode",
+        "MultipleConditionHeadersNotSupported",
+        "OperationTimedOut",
+        "OutOfRangeInput",
+        "OutOfRangeQueryParameterValue",
+        "RequestBodyTooLarge",
+        "ResourceTypeMismatch",
+        "RequestUrlFailedToParse",
+        "ResourceAlreadyExists",
+        "ResourceNotFound",
+        "ServerBusy",
+        "UnsupportedHeader",
+        "UnsupportedXmlNode",
+        "UnsupportedQueryParameter",
+        "UnsupportedHttpVerb",
+        "AppendPositionConditionNotMet",
+        "BlobAlreadyExists",
+        "BlobNotFound",
+        "BlobOverwritten",
+        "BlobTierInadequateForContentLength",
+        "BlockCountExceedsLimit",
+        "BlockListTooLong",
+        "CannotChangeToLowerTier",
+        "CannotVerifyCopySource",
+        "ContainerAlreadyExists",
+        "ContainerBeingDeleted",
+        "ContainerDisabled",
+        "ContainerNotFound",
+        "ContentLengthLargerThanTierLimit",
+        "CopyAcrossAccountsNotSupported",
+        "CopyIdMismatch",
+        "FeatureVersionMismatch",
+        "IncrementalCopyBlobMismatch",
+        "IncrementalCopyOfEralierVersionSnapshotNotAllowed",
+        "IncrementalCopySourceMustBeSnapshot",
+        "InfiniteLeaseDurationRequired",
+        "InvalidBlobOrBlock",
+        "InvalidBlobTier",
+        "InvalidBlobType",
+        "InvalidBlockId",
+        "InvalidBlockList",
+        "InvalidOperation",
+        "InvalidPageRange",
+        "InvalidSourceBlobType",
+        "InvalidSourceBlobUrl",
+        "InvalidVersionForPageBlobOperation",
+        "LeaseAlreadyPresent",
+        "LeaseAlreadyBroken",
+        "LeaseIdMismatchWithBlobOperation",
+        "LeaseIdMismatchWithContainerOperation",
+        "LeaseIdMismatchWithLeaseOperation",
+        "LeaseIdMissing",
+        "LeaseIsBreakingAndCannotBeAcquired",
+        "LeaseIsBreakingAndCannotBeChanged",
+        "LeaseIsBrokenAndCannotBeRenewed",
+        "LeaseLost",
+        "LeaseNotPresentWithBlobOperation",
+        "LeaseNotPresentWithContainerOperation",
+        "LeaseNotPresentWithLeaseOperation",
+        "MaxBlobSizeConditionNotMet",
+        "NoPendingCopyOperation",
+        "OperationNotAllowedOnIncrementalCopyBlob",
+        "PendingCopyOperation",
+        "PreviousSnapshotCannotBeNewer",
+        "PreviousSnapshotNotFound",
+        "PreviousSnapshotOperationNotSupported",
+        "SequenceNumberConditionNotMet",
+        "SequenceNumberIncrementTooLarge",
+        "SnapshotCountExceeded",
+        "SnaphotOperationRateExceeded",
+        "SnapshotsPresent",
+        "SourceConditionNotMet",
+        "SystemInUse",
+        "TargetConditionNotMet",
+        "UnauthorizedBlobOverwrite",
+        "BlobBeingRehydrated",
+        "BlobArchived",
+        "BlobNotArchived"
+      ],
+      "x-ms-enum": {
+        "name": "StorageErrorCode",
+        "modelAsString": true
+      }
+    },
+    "FilterBlobsItem": {
+      "xml": {
+        "name": "Blob"
+      },
+      "type": "object",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "ContainerName": {
+          "type": "string"
+        },
+        "TagValue": {
+          "type": "string"
+        }
+      }
+    },
+    "FilterBlobsSegment": {
+      "xml": {
+        "name": "Blobs"
+      },
+      "type": "object",
+      "properties": {
+        "BlobItems": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/FilterBlobsItem"
+          }
+        }
+      }
+    },
+    "FilterBlobsResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of blobs which matched the filter.",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "Filter",
+        "Segment",
+        "NextMarker"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Filter": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "Segment": {
+          "$ref": "#/definitions/FilterBlobsSegment"
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "GeoReplication": {
+      "description": "Geo-Replication information for the Secondary Storage Service",
+      "type": "object",
+      "required": [
+        "Status",
+        "LastSyncTime"
+      ],
+      "properties": {
+        "Status": {
+          "description": "The status of the secondary location",
+          "type": "string",
+          "enum": [
+            "live",
+            "bootstrap",
+            "unavailable"
+          ],
+          "x-ms-enum": {
+            "name": "GeoReplicationStatusType",
+            "modelAsString": true
+          }
+        },
+        "LastSyncTime": {
+          "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
+          "type": "string",
+          "format": "date-time-rfc1123"
+        }
+      }
+    },
+    "Logging": {
+      "description": "Azure Analytics Logging settings.",
+      "type": "object",
+      "required": [
+        "Version",
+        "Delete",
+        "Read",
+        "Write",
+        "RetentionPolicy"
+      ],
+      "properties": {
+        "Version": {
+          "description": "The version of Storage Analytics to configure.",
+          "type": "string"
+        },
+        "Delete": {
+          "description": "Indicates whether all delete requests should be logged.",
+          "type": "boolean"
+        },
+        "Read": {
+          "description": "Indicates whether all read requests should be logged.",
+          "type": "boolean"
+        },
+        "Write": {
+          "description": "Indicates whether all write requests should be logged.",
+          "type": "boolean"
+        },
+        "RetentionPolicy": {
+          "$ref": "#/definitions/RetentionPolicy"
+        }
+      }
+    },
+    "ContainerMetadata": {
+      "type": "object",
+      "xml": {
+        "name": "Metadata"
+      },
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "BlobMetadata": {
+      "type": "object",
+      "xml": {
+        "name": "Metadata"
+      },
+      "properties": {
+        "Encrypted": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        }
+      },
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "Metrics": {
+      "description": "a summary of request statistics grouped by API in hour or minute aggregates for blobs",
+      "required": [
+        "Enabled"
+      ],
+      "properties": {
+        "Version": {
+          "description": "The version of Storage Analytics to configure.",
+          "type": "string"
+        },
+        "Enabled": {
+          "description": "Indicates whether metrics are enabled for the Blob service.",
+          "type": "boolean"
+        },
+        "IncludeAPIs": {
+          "description": "Indicates whether metrics should generate summary statistics for called API operations.",
+          "type": "boolean"
+        },
+        "RetentionPolicy": {
+          "$ref": "#/definitions/RetentionPolicy"
+        }
+      }
+    },
+    "PageList": {
+      "description": "the list of pages",
+      "type": "object",
+      "properties": {
+        "PageRange": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PageRange"
+          }
+        },
+        "ClearRange": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ClearRange"
+          }
+        }
+      }
+    },
+    "PageRange": {
+      "type": "object",
+      "required": [
+        "Start",
+        "End"
+      ],
+      "properties": {
+        "Start": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "Start"
+          }
+        },
+        "End": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "End"
+          }
+        }
+      },
+      "xml": {
+        "name": "PageRange"
+      }
+    },
+    "ClearRange": {
+      "type": "object",
+      "required": [
+        "Start",
+        "End"
+      ],
+      "properties": {
+        "Start": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "Start"
+          }
+        },
+        "End": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "End"
+          }
+        }
+      },
+      "xml": {
+        "name": "ClearRange"
+      }
+    },
+    "RetentionPolicy": {
+      "description": "the retention policy which determines how long the associated data should persist",
+      "type": "object",
+      "required": [
+        "Enabled"
+      ],
+      "properties": {
+        "Enabled": {
+          "description": "Indicates whether a retention policy is enabled for the storage service",
+          "type": "boolean"
+        },
+        "Days": {
+          "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
+          "type": "integer",
+          "minimum": 1
+        }
+      }
+    },
+    "SignedIdentifier": {
+      "xml": {
+        "name": "SignedIdentifier"
+      },
+      "description": "signed identifier",
+      "type": "object",
+      "required": [
+        "Id",
+        "AccessPolicy"
+      ],
+      "properties": {
+        "Id": {
+          "type": "string",
+          "description": "a unique id"
+        },
+        "AccessPolicy": {
+          "$ref": "#/definitions/AccessPolicy"
+        }
+      }
+    },
+    "SignedIdentifiers": {
+      "description": "a collection of signed identifiers",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/SignedIdentifier"
+      },
+      "xml": {
+        "wrapped": true,
+        "name": "SignedIdentifiers"
+      }
+    },
+    "StaticWebsite": {
+      "description": "The properties that enable an account to host a static website",
+      "type": "object",
+      "required": [
+        "Enabled"
+      ],
+      "properties": {
+        "Enabled": {
+          "description": "Indicates whether this account is hosting a static website",
+          "type": "boolean"
+        },
+        "IndexDocument": {
+          "description": "The default name of the index page under each directory",
+          "type": "string"
+        },
+        "ErrorDocument404Path": {
+          "description": "The absolute path of the custom 404 page",
+          "type": "string"
+        }
+      }
+    },
+    "StorageServiceProperties": {
+      "description": "Storage Service Properties.",
+      "type": "object",
+      "properties": {
+        "Logging": {
+          "$ref": "#/definitions/Logging"
+        },
+        "HourMetrics": {
+          "$ref": "#/definitions/Metrics"
+        },
+        "MinuteMetrics": {
+          "$ref": "#/definitions/Metrics"
+        },
+        "Cors": {
+          "description": "The set of CORS rules.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CorsRule"
+          },
+          "xml": {
+            "wrapped": true
+          }
+        },
+        "DefaultServiceVersion": {
+          "description": "The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions",
+          "type": "string"
+        },
+        "DeleteRetentionPolicy": {
+          "$ref": "#/definitions/RetentionPolicy"
+        },
+        "StaticWebsite": {
+          "$ref": "#/definitions/StaticWebsite"
+        }
+      }
+    },
+    "StorageServiceStats": {
+      "description": "Stats for the storage service.",
+      "type": "object",
+      "properties": {
+        "GeoReplication": {
+          "$ref": "#/definitions/GeoReplication"
+        }
+      }
+    }
+  },
+    "parameters": {
+        "Url": {
+            "name": "url",
+            "description": "The URL of the service account, container, or blob that is the targe of the desired operation.",
+            "required": true,
+            "type": "string",
+            "in": "path",
+            "x-ms-skip-url-encoding": true
+        },
+        "ApiVersionParameter": {
+            "name": "x-ms-version",
+            "x-ms-client-name": "version",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "description": "Specifies the version of the operation to use for this request.",
+            "enum": [
+                "2019-02-02"
+            ]
+        },
+        "Blob": {
+            "name": "blob",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+)*(?:\\.[a-zA-Z0-9]+){0,1}$",
+            "minLength": 1,
+            "maxLength": 1024,
+            "x-ms-parameter-location": "method",
+            "description": "The blob name."
+        },
+        "Filesystem": {
+            "name": "filesystem",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The filesystem name."
+        },
+        "Path": {
+            "name": "path",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The namespace path to a file or directory."
+        },
+        "BlobCacheControl": {
+            "name": "x-ms-blob-cache-control",
+            "x-ms-client-name": "blobCacheControl",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's cache control. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobConditionAppendPos": {
+            "name": "x-ms-blob-condition-appendpos",
+            "x-ms-client-name": "appendPosition",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "append-position-access-conditions"
+            },
+            "description": "Optional conditional header, used only for the Append Block operation. A number indicating the byte offset to compare. Append Block will succeed only if the append position is equal to this number. If it is not, the request will fail with the AppendPositionConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+        },
+        "BlobConditionMaxSize": {
+            "name": "x-ms-blob-condition-maxsize",
+            "x-ms-client-name": "maxSize",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "append-position-access-conditions"
+            },
+            "description": "Optional conditional header. The max length in bytes permitted for the append blob. If the Append Block operation would cause the blob to exceed that limit or if the blob size is already greater than the value specified in this header, the request will fail with MaxBlobSizeConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+        },
+        "BlobPublicAccess": {
+            "name": "x-ms-blob-public-access",
+            "x-ms-client-name": "access",
+            "in": "header",
+            "required": false,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies whether data in the container may be accessed publicly and the level of access",
+            "type": "string",
+            "enum": [
+                "container",
+                "blob"
+            ],
+            "x-ms-enum": {
+                "name": "PublicAccessType",
+                "modelAsString": true
+            }
+        },
+        "AccessTierRequired": {
+            "name": "x-ms-access-tier",
+            "x-ms-client-name": "tier",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+                "P4",
+                "P6",
+                "P10",
+                "P20",
+                "P30",
+                "P40",
+                "P50",
+                "Hot",
+                "Cool",
+                "Archive"
+            ],
+            "x-ms-enum": {
+                "name": "AccessTier",
+                "modelAsString": true
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Indicates the tier to be set on the blob."
+        },
+        "AccessTierOptional": {
+            "name": "x-ms-access-tier",
+            "x-ms-client-name": "tier",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "Hot",
+                "Cool",
+                "Archive"
+            ],
+            "x-ms-enum": {
+                "name": "AccessTier",
+                "modelAsString": true
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Indicates the tier to be set on the blob."
+        },
+        "RehydratePriority": {
+            "name": "x-ms-rehydrate-priority",
+            "x-ms-client-name": "rehydratePriority",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "High",
+                "Standard"
+            ],
+            "x-ms-enum": {
+                "name": "RehydratePriority",
+                "modelAsString": true
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Optional: Indicates the priority with which to rehydrate an archived blob."
+        },
+        "BlobContentDisposition": {
+            "name": "x-ms-blob-content-disposition",
+            "x-ms-client-name": "blobContentDisposition",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's Content-Disposition header."
+        },
+        "BlobContentEncoding": {
+            "name": "x-ms-blob-content-encoding",
+            "x-ms-client-name": "blobContentEncoding",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's content encoding. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobContentLanguage": {
+            "name": "x-ms-blob-content-language",
+            "x-ms-client-name": "blobContentLanguage",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Set the blob's content language. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobContentLengthOptional": {
+            "name": "x-ms-blob-content-length",
+            "x-ms-client-name": "blobContentLength",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+        },
+        "BlobContentLengthRequired": {
+            "name": "x-ms-blob-content-length",
+            "x-ms-client-name": "blobContentLength",
+            "in": "header",
+            "required": true,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+        },
+        "BlobContentMD5": {
+            "name": "x-ms-blob-content-md5",
+            "x-ms-client-name": "blobContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded."
+        },
+        "BlobContentType": {
+            "name": "x-ms-blob-content-type",
+            "x-ms-client-name": "blobContentType",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's content type. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobSequenceNumber": {
+            "name": "x-ms-blob-sequence-number",
+            "x-ms-client-name": "blobSequenceNumber",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "default": 0,
+            "x-ms-parameter-location": "method",
+            "description": "Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1."
+        },
+        "BlobTagsBody": {
+            "name": "Tags",
+            "in": "body",
+            "required": true,
+            "schema": {
+                "$ref": "#/definitions/BlobTags"
+            },
+            "x-ms-parameter-location": "method"
+        },
+        "BlobTagsHeader": {
+            "name": "x-ms-tags",
+            "x-ms-client-name": "tags",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags."
+        },
+        "BlobTagFilter": {
+            "name": "filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "x-m-parameter-location": "method",
+            "description": "The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results."
+        },
+        "BlockId": {
+            "name": "blockid",
+            "x-ms-client-name": "blockId",
+            "in": "query",
+            "type": "string",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "A valid Base64 string value that identifies the block. Prior to encoding, the string must be less than or equal to 64 bytes in size. For a given blob, the length of the value specified for the blockid parameter must be the same size for each block."
+        },
+        "BlockListType": {
+            "name": "blocklisttype",
+            "x-ms-client-name": "listType",
+            "in": "query",
+            "required": true,
+            "default": "committed",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies whether to return the list of committed blocks, the list of uncommitted blocks, or both lists together.",
+            "type": "string",
+            "enum": [
+                "committed",
+                "uncommitted",
+                "all"
+            ],
+            "x-ms-enum": {
+                "name": "BlockListType",
+                "modelAsString": false
+            }
+        },
+        "Body": {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+                "type": "object",
+                "format": "file"
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Initial data"
+        },
+        "Continuation": {
+            "name": "continuation",
+            "x-ms-client-name": "marker",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "When renaming a directory, the number of paths that are renamed with each invocation is limited.  If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header.  When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory."
+        },
+        "ContainerAcl": {
+            "name": "containerAcl",
+            "in": "body",
+            "schema": {
+                "$ref": "#/definitions/SignedIdentifiers"
+            },
+            "x-ms-parameter-location": "method",
+            "description": "the acls for the container"
+        },
+        "CopyId": {
+            "name": "copyid",
+            "x-ms-client-name": "copyId",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The copy identifier provided in the x-ms-copy-id header of the original Copy Blob operation."
+        },
+        "ClientRequestId": {
+            "name": "x-ms-client-request-id",
+            "x-ms-client-name": "requestId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "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."
+        },
+        "ContainerName": {
+            "name": "containerName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The container name."
+        },
+        "ContentCrc64": {
+            "name": "x-ms-content-crc64",
+            "x-ms-client-name": "transactionalContentCrc64",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the transactional crc64 for the body, to be validated by the service."
+        },
+        "ContentLength": {
+            "name": "Content-Length",
+            "in": "header",
+            "required": true,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "description": "The length of the request."
+        },
+        "ContentMD5": {
+            "name": "Content-MD5",
+            "x-ms-client-name": "transactionalContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the transactional md5 for the body, to be validated by the service."
+        },
+        "CopySource": {
+            "name": "x-ms-copy-source",
+            "x-ms-client-name": "copySource",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "format": "url",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature."
+        },
+        "DeleteSnapshots": {
+            "name": "x-ms-delete-snapshots",
+            "x-ms-client-name": "deleteSnapshots",
+            "description": "Required if the blob has associated snapshots. Specify one of the following two options: include: Delete the base blob and all of its snapshots. only: Delete only the blob's snapshots and not the blob itself",
+            "x-ms-parameter-location": "method",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "include",
+                "only"
+            ],
+            "x-ms-enum": {
+                "name": "DeleteSnapshotsOptionType",
+                "modelAsString": false
+            }
+        },
+        "Delimiter": {
+            "name": "delimiter",
+            "description": "When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.",
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "in": "query",
+            "required": true
+        },
+        "DirectoryProperties": {
+            "name": "x-ms-properties",
+            "description": "Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs \"n1=v1, n2=v2, ...\", where each value is base64 encoded.",
+            "x-ms-client-name": "directoryProperties",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "EncryptionKey": {
+            "name": "x-ms-encryption-key",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "EncryptionScope": {
+            "name": "x-ms-encryption-scope",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "x-ms-client-name": "EncryptionScope",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "customer-provided-key-info"
+            },
+            "description": "Optional. Specifies the encryption scope to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "EncryptionKeySha256": {
+            "name": "x-ms-encryption-key-sha256",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "x-ms-parameter-location": "method",
+            "description": "The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided."
+        },
+        "EncryptionAlgorithm": {
+            "name": "x-ms-encryption-algorithm",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "enum": [
+                "AES256"
+            ],
+            "x-ms-enum": {
+                "name": "EncryptionAlgorithmType",
+                "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "The algorithm used to produce the encryption key hash. Currently, the only accepted value is \"AES256\". Must be provided if the x-ms-encryption-key header is provided."
+        },
+        "DefaultEncryptionScope": {
+            "name": "x-ms-default-encryption-scope",
+            "type": "string",
+            "in": "header",
+            "required": false,
+            "x-ms-client-name": "DefaultEncryptionScope",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies the default encryption scope on the container. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "DenyEncryptionScopeOverride": {
+            "name": "x-ms-deny-encryption-scope-override",
+            "type": "boolean",
+            "in": "header",
+            "required": false,
+            "x-ms-client-name": "DenyEncryptionScopeOverride",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies whether to deny encryption scope override provided in the request or not. If true, reject the request with encryption scope. If false, encryption is performed using encryption scope provided in the request. For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "FileRenameSource": {
+            "name": "x-ms-rename-source",
+            "x-ms-client-name": "renameSource",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The file or directory to be renamed. The value must have the following format: \"/{filesysystem}/{path}\".  If \"x-ms-properties\" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved."
+        },
+        "GetRangeContentMD5": {
+            "name": "x-ms-range-get-content-md5",
+            "x-ms-client-name": "rangeGetContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "boolean",
+            "x-ms-parameter-location": "method",
+            "description": "When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size."
+        },
+        "GetRangeContentCRC64": {
+            "name": "x-ms-range-get-content-crc64",
+            "x-ms-client-name": "rangeGetContentCRC64",
+            "in": "header",
+            "required": false,
+            "type": "boolean",
+            "x-ms-parameter-location": "method",
+            "description": "When set to true and specified together with the Range, the service returns the CRC64 hash for the range, as long as the range is less than or equal to 4 MB in size."
+        },
+        "IfMatch": {
+            "name": "If-Match",
+            "x-ms-client-name": "ifMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs with a matching value."
+        },
+        "IfModifiedSince": {
+            "name": "If-Modified-Since",
+            "x-ms-client-name": "ifModifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+        },
+        "IfNoneMatch": {
+            "name": "If-None-Match",
+            "x-ms-client-name": "ifNoneMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs without a matching value."
+        },
+        "IfUnmodifiedSince": {
+            "name": "If-Unmodified-Since",
+            "x-ms-client-name": "ifUnmodifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+        },
+        "IfSequenceNumberEqualTo": {
+            "name": "x-ms-if-sequence-number-eq",
+            "x-ms-client-name": "ifSequenceNumberEqualTo",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "sequence-number-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has the specified sequence number."
+        },
+        "IfSequenceNumberLessThan": {
+            "name": "x-ms-if-sequence-number-lt",
+            "x-ms-client-name": "ifSequenceNumberLessThan",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "sequence-number-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has a sequence number less than the specified."
+        },
+        "IfSequenceNumberLessThanOrEqualTo": {
+            "name": "x-ms-if-sequence-number-le",
+            "x-ms-client-name": "ifSequenceNumberLessThanOrEqualTo",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "sequence-number-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has a sequence number less than or equal to the specified."
+        },
+        "KeyInfo": {
+            "name": "KeyInfo",
+            "in": "body",
+            "x-ms-parameter-location": "method",
+            "required": true,
+            "schema": {
+                "$ref": "#/definitions/KeyInfo"
+            }
+        },
+        "ListBlobsInclude": {
+            "name": "include",
+            "in": "query",
+            "required": false,
+            "type": "array",
+            "collectionFormat": "csv",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "copy",
+                    "deleted",
+                    "metadata",
+                    "snapshots",
+                    "tags",
+                    "uncommittedblobs"
+                ],
+                "x-ms-enum": {
+                    "name": "ListBlobsIncludeItem",
+                    "modelAsString": false
+                }
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Include this parameter to specify one or more datasets to include in the response."
+        },
+        "ListContainersInclude": {
+            "name": "include",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "metadata"
+            ],
+            "x-ms-enum": {
+                "name": "ListContainersIncludeType",
+                "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Include this parameter to specify that the container's metadata be returned as part of the response body."
+        },
+        "LeaseBreakPeriod": {
+            "name": "x-ms-lease-break-period",
+            "x-ms-client-name": "breakPeriod",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "x-ms-parameter-location": "method",
+            "description": "For a break operation, proposed duration the lease should continue before it is broken, in seconds, between 0 and 60. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately."
+        },
+        "LeaseDuration": {
+            "name": "x-ms-lease-duration",
+            "x-ms-client-name": "duration",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change."
+        },
+        "LeaseIdOptional": {
+            "name": "x-ms-lease-id",
+            "x-ms-client-name": "leaseId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "lease-access-conditions"
+            },
+            "description": "If specified, the operation only succeeds if the resource's lease is active and matches this ID."
+        },
+        "LeaseIdRequired": {
+            "name": "x-ms-lease-id",
+            "x-ms-client-name": "leaseId",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the current lease ID on the resource."
+        },
+        "Marker": {
+            "name": "marker",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
+            "x-ms-parameter-location": "method"
+        },
+        "MaxResults": {
+            "name": "maxresults",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
+        },
+        "Metadata": {
+            "name": "x-ms-meta",
+            "x-ms-client-name": "metadata",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.",
+            "x-ms-header-collection-prefix": "x-ms-meta-"
+        },
+        "PathRenameMode": {
+            "name": "mode",
+            "x-ms-client-name": "pathRenameMode",
+            "description": "Determines the behavior of the rename operation",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "legacy",
+                "posix"
+            ],
+            "x-ms-enum": {
+                "name": "PathRenameMode",
+                "modelAsString": false
+            }
+        },
+        "PosixPermissions": {
+            "name": "x-ms-permissions",
+            "description": "Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.",
+            "x-ms-client-name": "posixPermissions",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "PosixUmask": {
+            "name": "x-ms-umask",
+            "x-ms-client-name": "posixUmask",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used."
+        },
+        "Prefix": {
+            "name": "prefix",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Filters the results to return only containers whose name begins with the specified prefix.",
+            "x-ms-parameter-location": "method"
+        },
+        "PrevSnapshot": {
+            "name": "prevsnapshot",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Optional in version 2015-07-08 and newer. The prevsnapshot parameter is a DateTime value that specifies that the response will contain only pages that were changed between target blob and previous snapshot. Changed pages include both updated and cleared pages. The target blob may be a snapshot, as long as the snapshot specified by prevsnapshot is the older of the two. Note that incremental snapshots are currently supported only for blobs created on or after January 1, 2016."
+        },
+        "ProposedLeaseIdOptional": {
+            "name": "x-ms-proposed-lease-id",
+            "x-ms-client-name": "proposedLeaseId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+        },
+        "ProposedLeaseIdRequired": {
+            "name": "x-ms-proposed-lease-id",
+            "x-ms-client-name": "proposedLeaseId",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+        },
+        "Range": {
+            "name": "x-ms-range",
+            "x-ms-client-name": "range",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Return only the bytes of the blob in the specified range."
+        },
+        "RecursiveDirectoryDelete": {
+            "name": "recursive",
+            "x-ms-client-name": "recursiveDirectoryDelete",
+            "in": "query",
+            "required": true,
+            "type": "boolean",
+            "x-ms-parameter-location": "method",
+            "description": "If \"true\", all paths beneath the directory will be deleted. If \"false\" and the directory is non-empty, an error occurs."
+        },
+        "SequenceNumberAction": {
+            "name": "x-ms-sequence-number-action",
+            "x-ms-client-name": "sequenceNumberAction",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required if the x-ms-blob-sequence-number header is set for the request. This property applies to page blobs only. This property indicates how the service should modify the blob's sequence number",
+            "type": "string",
+            "enum": [
+                "max",
+                "update",
+                "increment"
+            ],
+            "x-ms-enum": {
+                "name": "SequenceNumberActionType",
+                "modelAsString": false
+            }
+        },
+        "Snapshot": {
+            "name": "snapshot",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob\">Creating a Snapshot of a Blob.</a>"
+        },
+        "SourceContentMD5": {
+            "name": "x-ms-source-content-md5",
+            "x-ms-client-name": "sourceContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the md5 calculated for the range of bytes that must be read from the copy source."
+        },
+        "SourceContentCRC64": {
+            "name": "x-ms-source-content-crc64",
+            "x-ms-client-name": "sourceContentcrc64",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the crc64 calculated for the range of bytes that must be read from the copy source."
+        },
+        "SourceRange": {
+            "name": "x-ms-source-range",
+            "x-ms-client-name": "sourceRange",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Bytes of source data in the specified range."
+        },
+        "RangeRequiredPutPageFromUrl": {
+            "name": "x-ms-range",
+            "x-ms-client-name": "range",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required."
+        },
+        "SourceRangeRequiredPutPageFromUrl": {
+            "name": "x-ms-source-range",
+            "x-ms-client-name": "sourceRange",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Bytes of source data in the specified range. The length of this range should match the ContentLength header and x-ms-range/Range destination range header."
+        },
+        "SourceIfMatch": {
+            "name": "x-ms-source-if-match",
+            "x-ms-client-name": "sourceIfMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs with a matching value."
+        },
+        "SourceIfModifiedSince": {
+            "name": "x-ms-source-if-modified-since",
+            "x-ms-client-name": "sourceIfModifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+        },
+        "SourceIfNoneMatch": {
+            "name": "x-ms-source-if-none-match",
+            "x-ms-client-name": "sourceIfNoneMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs without a matching value."
+        },
+        "SourceIfUnmodifiedSince": {
+            "name": "x-ms-source-if-unmodified-since",
+            "x-ms-client-name": "sourceIfUnmodifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+        },
+        "SourceLeaseId": {
+            "name": "x-ms-source-lease-id",
+            "x-ms-client-name": "sourceLeaseId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match."
+        },
+        "SourceUrl": {
+            "name": "x-ms-copy-source",
+            "x-ms-client-name": "sourceUrl",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "format": "url",
+            "x-ms-parameter-location": "method",
+            "description": "Specify a URL to the copy source."
+        },
+        "StorageServiceProperties": {
+            "name": "StorageServiceProperties",
+            "in": "body",
+            "required": true,
+            "schema": {
+                "$ref": "#/definitions/StorageServiceProperties"
+            },
+            "x-ms-parameter-location": "method",
+            "description": "The StorageService properties."
+        },
+        "Timeout": {
+            "name": "timeout",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 0,
+            "x-ms-parameter-location": "method",
+            "description": "The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations\">Setting Timeouts for Blob Service Operations.</a>"
+        },
+        "VersionId": {
+            "name": "versionid",
+            "x-ms-client-name": "versionId",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve."
+        },
+        "XMsCacheControl": {
+            "name": "x-ms-cache-control",
+            "x-ms-client-name": "cacheControl",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Cache control for given resource"
+        },
+        "XMsContentType": {
+            "name": "x-ms-content-type",
+            "x-ms-client-name": "contentType",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content type for given resource"
+        },
+        "XMsContentEncoding": {
+            "name": "x-ms-content-encoding",
+            "x-ms-client-name": "contentEncoding",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content encoding for given resource"
+        },
+        "XMsContentLanguage": {
+            "name": "x-ms-content-language",
+            "x-ms-client-name": "contentLanguage",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content language for given resource"
+        },
+        "XMsContentDisposition": {
+            "name": "x-ms-content-disposition",
+            "x-ms-client-name": "contentDisposition",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content disposition for given resource"
+        }
+    }
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/swagger/blob.json b/sdk/storage/azure-storage-blob/swagger/blob.json
deleted file mode 100644
index 0bf6a308f327..000000000000
--- a/sdk/storage/azure-storage-blob/swagger/blob.json
+++ /dev/null
@@ -1,8647 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Azure Blob Storage",
-    "version": "2018-11-09",
-    "x-ms-code-generation-settings": {
-      "header": "MIT",
-      "strictSpecAdherence": false
-    }
-  },
-  "x-ms-parameterized-host": {
-    "hostTemplate": "{url}",
-    "useSchemePrefix": false,
-    "positionInOperation": "first",
-    "parameters": [
-      {
-        "$ref": "#/parameters/Url"
-      }
-    ]
-  },
-  "securityDefinitions": {
-    "blob_shared_key": {
-      "type": "apiKey",
-      "name": "Authorization",
-      "in": "header"
-    }
-  },
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/xml"
-  ],
-  "produces": [
-    "application/xml"
-  ],
-  "paths": {},
-  "x-ms-paths": {
-    "/?restype=service&comp=properties": {
-      "put": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_SetProperties",
-        "description": "Sets properties for a storage account's Blob service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
-        "parameters": [
-          {
-            "$ref": "#/parameters/StorageServiceProperties"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Success (Accepted)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetProperties",
-        "description": "gets the properties of a storage account's Blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceProperties"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/?restype=service&comp=stats": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetStatistics",
-        "description": "Retrieves statistics related to replication for the Blob service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceStats"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "stats"
-          ]
-        }
-      ]
-    },
-    "/?comp=list": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_ListContainersSegment",
-        "description": "The List Containers Segment operation returns a list of the containers under the specified account",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListContainersInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListContainersSegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/?restype=service&comp=userdelegationkey": {
-      "post": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetUserDelegationKey",
-        "description": "Retrieves a user delgation key for the Blob service. This is only a valid operation when using bearer token authentication.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/KeyInfo"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/UserDelegationKey"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "userdelegationkey"
-          ]
-        }
-      ]
-    },
-    "/?restype=account&comp=properties": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetAccountInfo",
-        "description": "Returns the sku name and account kind ",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success (OK)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-sku-name": {
-                "x-ms-client-name": "SkuName",
-                "type": "string",
-                "enum": [
-                  "Standard_LRS",
-                  "Standard_GRS",
-                  "Standard_RAGRS",
-                  "Standard_ZRS",
-                  "Premium_LRS"
-                ],
-                "x-ms-enum": {
-                  "name": "SkuName",
-                  "modelAsString": false
-                },
-                "description": "Identifies the sku name of the account"
-              },
-              "x-ms-account-kind": {
-                "x-ms-client-name": "AccountKind",
-                "type": "string",
-                "enum": [
-                  "Storage",
-                  "BlobStorage",
-                  "StorageV2"
-                ],
-                "x-ms-enum": {
-                  "name": "AccountKind",
-                  "modelAsString": false
-                },
-                "description": "Identifies the account kind"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "account"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_Create",
-        "description": "creates a new container under the specified account. If the container with the same name already exists, the operation fails",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/BlobPublicAccess"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Success, Container created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_GetProperties",
-        "description": "returns all user-defined metadata and system properties for the specified container. The data returned does not include the container's list of blobs",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-public-access": {
-                "x-ms-client-name": "BlobPublicAccess",
-                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
-                "type": "string",
-                "enum": [
-                  "container",
-                  "blob"
-                ],
-                "x-ms-enum": {
-                  "name": "PublicAccessType",
-                  "modelAsString": true
-                }
-              },
-              "x-ms-has-immutability-policy": {
-                "x-ms-client-name": "HasImmutabilityPolicy",
-                "description": "Indicates whether the container has an immutability policy set on it.",
-                "type": "boolean"
-              },
-              "x-ms-has-legal-hold": {
-                "x-ms-client-name": "HasLegalHold",
-                "description": "Indicates whether the container has a legal hold.",
-                "type": "boolean"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_Delete",
-        "description": "operation marks the specified container for deletion. The container and any blobs contained within it are later deleted during garbage collection",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Accepted",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=metadata": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_SetMetadata",
-        "description": "operation sets one or more user-defined name-value pairs for the specified container.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "metadata"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=acl": {
-      "get": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_GetAccessPolicy",
-        "description": "gets the permissions for the specified container. The permissions indicate whether container data may be accessed publicly.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "x-ms-blob-public-access": {
-                "x-ms-client-name": "BlobPublicAccess",
-                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
-                "type": "string",
-                "enum": [
-                  "container",
-                  "blob"
-                ],
-                "x-ms-enum": {
-                  "name": "PublicAccessType",
-                  "modelAsString": true
-                }
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/SignedIdentifiers"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_SetAccessPolicy",
-        "description": "sets the permissions for the specified container. The permissions indicate whether blobs in a container may be accessed publicly.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/ContainerAcl"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobPublicAccess"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acl"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&acquire": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_AcquireLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseDuration"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The Acquire operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a container's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acquire"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&release": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_ReleaseLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Release operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "release"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&renew": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_RenewLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Renew operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a container's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "renew"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&break": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_BreakLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseBreakPeriod"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The Break operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-time": {
-                "x-ms-client-name": "LeaseTime",
-                "type": "integer",
-                "description": "Approximate time remaining in the lease period, in seconds."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "break"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&change": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_ChangeLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Change operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a container's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "change"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=list&flat": {
-      "get": {
-        "tags": [
-          "containers"
-        ],
-        "operationId": "Container_ListBlobFlatSegment",
-        "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListBlobsInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListBlobsFlatSegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=list&hierarchy": {
-      "get": {
-        "tags": [
-          "containers"
-        ],
-        "operationId": "Container_ListBlobHierarchySegment",
-        "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Delimiter"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListBlobsInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListBlobsHierarchySegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=account&comp=properties": {
-      "get": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_GetAccountInfo",
-        "description": "Returns the sku name and account kind ",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success (OK)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-sku-name": {
-                "x-ms-client-name": "SkuName",
-                "type": "string",
-                "enum": [
-                  "Standard_LRS",
-                  "Standard_GRS",
-                  "Standard_RAGRS",
-                  "Standard_ZRS",
-                  "Premium_LRS"
-                ],
-                "x-ms-enum": {
-                  "name": "SkuName",
-                  "modelAsString": false
-                },
-                "description": "Identifies the sku name of the account"
-              },
-              "x-ms-account-kind": {
-                "x-ms-client-name": "AccountKind",
-                "type": "string",
-                "enum": [
-                  "Storage",
-                  "BlobStorage",
-                  "StorageV2"
-                ],
-                "x-ms-enum": {
-                  "name": "AccountKind",
-                  "modelAsString": false
-                },
-                "description": "Identifies the account kind"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "account"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}": {
-      "get": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_Download",
-        "description": "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/GetRangeContentMD5"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Returns the content of the entire blob.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "Content-Length": {
-                "type": "integer",
-                "format": "int64",
-                "description": "The number of bytes present in the response body."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
-              },
-              "Content-Range": {
-                "type": "string",
-                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "Content-Encoding": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Encoding request header"
-              },
-              "Cache-Control": {
-                "type": "string",
-                "description": "This header is returned if it was previously specified for the blob."
-              },
-              "Content-Disposition": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
-              },
-              "Content-Language": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Language request header."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-blob-type": {
-                "x-ms-client-name": "BlobType",
-                "description": "The blob's type.",
-                "type": "string",
-                "enum": [
-                  "BlockBlob",
-                  "PageBlob",
-                  "AppendBlob"
-                ],
-                "x-ms-enum": {
-                  "name": "BlobType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-copy-completion-time": {
-                "x-ms-client-name": "CopyCompletionTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status-description": {
-                "x-ms-client-name": "CopyStatusDescription",
-                "type": "string",
-                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-progress": {
-                "x-ms-client-name": "CopyProgress",
-                "type": "string",
-                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-source": {
-                "x-ms-client-name": "CopySource",
-                "type": "string",
-                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Accept-Ranges": {
-                "type": "string",
-                "description": "Indicates that the service supports requests for partial blob content."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              },
-              "x-ms-blob-content-md5": {
-                "x-ms-client-name": "BlobContentMD5",
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
-              }
-            },
-            "schema": {
-              "type": "object",
-              "format": "file"
-            }
-          },
-          "206": {
-            "description": "Returns the content of a specified range of the blob.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "Content-Length": {
-                "type": "integer",
-                "format": "int64",
-                "description": "The number of bytes present in the response body."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
-              },
-              "Content-Range": {
-                "type": "string",
-                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "Content-Encoding": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Encoding request header"
-              },
-              "Cache-Control": {
-                "type": "string",
-                "description": "This header is returned if it was previously specified for the blob."
-              },
-              "Content-Disposition": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
-              },
-              "Content-Language": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Language request header."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-blob-type": {
-                "x-ms-client-name": "BlobType",
-                "description": "The blob's type.",
-                "type": "string",
-                "enum": [
-                  "BlockBlob",
-                  "PageBlob",
-                  "AppendBlob"
-                ],
-                "x-ms-enum": {
-                  "name": "BlobType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-copy-completion-time": {
-                "x-ms-client-name": "CopyCompletionTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status-description": {
-                "x-ms-client-name": "CopyStatusDescription",
-                "type": "string",
-                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-progress": {
-                "x-ms-client-name": "CopyProgress",
-                "type": "string",
-                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-source": {
-                "x-ms-client-name": "CopySource",
-                "type": "string",
-                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Accept-Ranges": {
-                "type": "string",
-                "description": "Indicates that the service supports requests for partial blob content."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
-              },
-              "x-ms-blob-content-md5": {
-                "x-ms-client-name": "BlobContentMD5",
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
-              }
-            },
-            "schema": {
-              "type": "object",
-              "format": "file"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "head": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_GetProperties",
-        "description": "The Get Properties operation returns all user-defined metadata, standard HTTP properties, and system properties for the blob. It does not return the content of the blob.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Returns the properties of the blob.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-creation-time": {
-                "x-ms-client-name": "CreationTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was created."
-              },
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "x-ms-blob-type": {
-                "x-ms-client-name": "BlobType",
-                "description": "The blob's type.",
-                "type": "string",
-                "enum": [
-                  "BlockBlob",
-                  "PageBlob",
-                  "AppendBlob"
-                ],
-                "x-ms-enum": {
-                  "name": "BlobType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-copy-completion-time": {
-                "x-ms-client-name": "CopyCompletionTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status-description": {
-                "x-ms-client-name": "CopyStatusDescription",
-                "type": "string",
-                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-progress": {
-                "x-ms-client-name": "CopyProgress",
-                "type": "string",
-                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-source": {
-                "x-ms-client-name": "CopySource",
-                "type": "string",
-                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-incremental-copy": {
-                "x-ms-client-name": "IsIncrementalCopy",
-                "type": "boolean",
-                "description": "Included if the blob is incremental copy blob."
-              },
-              "x-ms-copy-destination-snapshot": {
-                "x-ms-client-name": "DestinationSnapshot",
-                "type": "string",
-                "description": "Included if the blob is incremental copy blob or incremental copy snapshot, if x-ms-copy-status is success. Snapshot time of the last successful incremental copy snapshot for this blob."
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "Content-Length": {
-                "type": "integer",
-                "format": "int64",
-                "description": "The number of bytes present in the response body."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The content type specified for the blob. The default content type is 'application/octet-stream'"
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "Content-Encoding": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Encoding request header"
-              },
-              "Content-Disposition": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
-              },
-              "Content-Language": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Language request header."
-              },
-              "Cache-Control": {
-                "type": "string",
-                "description": "This header is returned if it was previously specified for the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "Accept-Ranges": {
-                "type": "string",
-                "description": "Indicates that the service supports requests for partial blob content."
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
-              },
-              "x-ms-access-tier": {
-                "x-ms-client-name": "AccessTier",
-                "type": "string",
-                "description": "The tier of page blob on a premium storage account or tier of block blob on blob storage LRS accounts. For a list of allowed premium page blob tiers, see https://docs.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features. For blob storage LRS accounts, valid values are Hot/Cool/Archive."
-              },
-              "x-ms-access-tier-inferred": {
-                "x-ms-client-name": "AccessTierInferred",
-                "type": "boolean",
-                "description": "For page blobs on a premium storage account only. If the access tier is not explicitly set on the blob, the tier is inferred based on its content length and this header will be returned with true value."
-              },
-              "x-ms-archive-status": {
-                "x-ms-client-name": "ArchiveStatus",
-                "type": "string",
-                "description": "For blob storage LRS accounts, valid values are rehydrate-pending-to-hot/rehydrate-pending-to-cool. If the blob is being rehydrated and is not complete then this header is returned indicating that rehydrate is pending and also tells the destination tier."
-              },
-              "x-ms-access-tier-change-time": {
-                "x-ms-client-name": "AccessTierChangeTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "The time the tier was changed on the object. This is only returned if the tier on the block blob was ever set."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_Delete",
-        "description": "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound). If the storage account's automatic snapshot feature is enabled, then, when a blob is deleted, an automatic snapshot is created. The blob becomes inaccessible immediately. All other operations on the blob causes the service to return an HTTP status code of 404 (ResourceNotFound). You can access automatic snapshot using snapshot timestamp or version id. You can restore the blob by calling Put or Copy Blob API with automatic snapshot as source. Deleting automatic snapshot requires shared key or special SAS/RBAC permissions.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/DeleteSnapshots"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The delete request was accepted and the blob will be deleted.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      }
-    },
-    "/{containerName}/{blob}?PageBlob": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "PageBlob_Create",
-        "description": "The Create operation creates a new page blob.",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLengthRequired"
-          },
-          {
-            "$ref": "#/parameters/BlobSequenceNumber"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The blob was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-blob-type",
-          "x-ms-client-name": "blobType",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
-          "type": "string",
-          "enum": [
-            "PageBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?AppendBlob": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "AppendBlob_Create",
-        "description": "The Create Append Blob operation creates a new append blob.",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The blob was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-blob-type",
-          "x-ms-client-name": "blobType",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
-          "type": "string",
-          "enum": [
-            "AppendBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?BlockBlob": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "BlockBlob_Upload",
-        "description": "The Upload Block Blob operation updates the content of an existing block blob. Updating an existing block blob overwrites any existing metadata on the blob. Partial updates are not supported with Put Blob; the content of the existing blob is overwritten with the content of the new blob. To perform a partial update of the content of a block blob, use the Put Block List operation.",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The blob was updated.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-blob-type",
-          "x-ms-client-name": "blobType",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
-          "type": "string",
-          "enum": [
-            "BlockBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=undelete": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_Undelete",
-        "description": "Undelete a blob that was previously soft deleted",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The blob was undeleted successfully.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "undelete"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=properties&SetHTTPHeaders": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_SetHTTPHeaders",
-        "description": "The Set HTTP Headers operation sets system properties on the blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The properties were set successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=metadata": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_SetMetadata",
-        "description": "The Set Blob Metadata operation sets user-defined metadata for the specified blob as one or more name-value pairs",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The metadata was set successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "metadata"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&acquire": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_AcquireLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseDuration"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The Acquire operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a blobs's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acquire"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&release": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_ReleaseLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Release operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "release"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&renew": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_RenewLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Renew operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a blobs's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "renew"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&change": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_ChangeLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Change operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a blobs's lease"
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "change"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&break": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_BreakLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseBreakPeriod"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The Break operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-time": {
-                "x-ms-client-name": "LeaseTime",
-                "type": "integer",
-                "description": "Approximate time remaining in the lease period, in seconds."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "break"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=snapshot": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_CreateSnapshot",
-        "description": "The Create Snapshot operation creates a read-only snapshot of a blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The snaptshot was taken successfully.",
-            "headers": {
-              "x-ms-snapshot": {
-                "x-ms-client-name": "Snapshot",
-                "type": "string",
-                "description": "Uniquely identifies the snapshot and indicates the snapshot version. It may be used in subsequent requests to access the snapshot"
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "True if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise. For a snapshot request, this header is set to true when metadata was provided in the request and encrypted with a customer-provided key."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the source blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "snapshot"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=copy": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_StartCopyFromURL",
-        "description": "The Start Copy From URL operation copies a blob or an internet resource to a new blob.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/CopySource"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The copy blob has been accepted with the specified copy status.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{containerName}/{blob}?comp=copy&sync": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_CopyFromURL",
-        "description": "The Copy From URL operation copies a blob or an internet resource to a new blob. It will not return a response until the copy is complete.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/CopySource"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The copy has completed.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "success"
-                ],
-                "x-ms-enum": {
-                  "name": "SyncCopyStatusType",
-                  "modelAsString": false
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-requires-sync",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "true"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=copy&copyid={CopyId}": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_AbortCopyFromURL",
-        "description": "The Abort Copy From URL operation aborts a pending Copy From URL operation, and leaves a destination blob with zero length and full metadata.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/CopyId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "The delete request was accepted and the blob will be deleted.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "copy"
-          ]
-        },
-        {
-          "name": "x-ms-copy-action",
-          "x-ms-client-name": "copyActionAbortConstant",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "abort"
-          ],
-          "x-ms-parameter-location": "method"
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=tier": {
-      "put": {
-        "tags": [
-          "blobs"
-        ],
-        "operationId": "Blob_SetTier",
-        "description": "The Set Tier operation sets the tier on a blob. The operation is allowed on a page blob in a premium storage account and on a block blob in a blob storage account (locally redundant storage only). A premium page blob's tier determines the allowed size, IOPS, and bandwidth of the blob. A block blob's tier determines Hot/Cool/Archive storage type. This operation does not update the blob's ETag.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/AccessTier"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The new tier will take effect immediately.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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 newer."
-              }
-            }
-          },
-          "202": {
-            "description": "The transition to the new tier is pending.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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 newer."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "tier"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?restype=account&comp=properties": {
-      "get": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_GetAccountInfo",
-        "description": "Returns the sku name and account kind ",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success (OK)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-sku-name": {
-                "x-ms-client-name": "SkuName",
-                "type": "string",
-                "enum": [
-                  "Standard_LRS",
-                  "Standard_GRS",
-                  "Standard_RAGRS",
-                  "Standard_ZRS",
-                  "Premium_LRS"
-                ],
-                "x-ms-enum": {
-                  "name": "SkuName",
-                  "modelAsString": false
-                },
-                "description": "Identifies the sku name of the account"
-              },
-              "x-ms-account-kind": {
-                "x-ms-client-name": "AccountKind",
-                "type": "string",
-                "enum": [
-                  "Storage",
-                  "BlobStorage",
-                  "StorageV2"
-                ],
-                "x-ms-enum": {
-                  "name": "AccountKind",
-                  "modelAsString": false
-                },
-                "description": "Identifies the account kind"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "account"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=block": {
-      "put": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_StageBlock",
-        "description": "The Stage Block operation creates a new block to be committed as part of a blob",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/BlockId"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/ContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "block"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=block&fromURL": {
-      "put": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_StageBlockFromURL",
-        "description": "The Stage Block operation creates a new block to be committed as part of a blob where the contents are read from a URL.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/BlockId"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/SourceUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceRange"
-          },
-          {
-            "$ref": "#/parameters/SourceContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-    	  },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "block"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=blocklist": {
-      "put": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_CommitBlockList",
-        "description": "The Commit Block List operation writes a blob by specifying the list of block IDs that make up the blob. In order to be written as part of a blob, a block must have been successfully written to the server in a prior Put Block operation. You can call Put Block List to update a blob by uploading only those blocks that have changed, then committing the new and existing blocks together. You can do this by specifying whether to commit a block from the committed block list or from the uncommitted block list, or to commit the most recently uploaded version of the block, whichever list it may belong to.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "name": "blocks",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/BlockLookupList"
-            }
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block list was recorded.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_GetBlockList",
-        "description": "The Get Block List operation retrieves the list of blocks that have been uploaded as part of a block blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/BlockListType"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The page range was written.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For Get Block List this is 'application/xml'"
-              },
-              "x-ms-blob-content-length": {
-                "x-ms-client-name": "BlobContentLength",
-                "type": "integer",
-                "format": "int64",
-                "description": "The size of the blob in bytes."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/BlockList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "blocklist"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=page&update": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_UploadPages",
-        "description": "The Upload Pages operation writes a range of pages to a page blob",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/ContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThan"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The page range was written.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for the page blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the pages. This header is only returned when the pages were encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "page"
-          ]
-        },
-        {
-          "name": "x-ms-page-write",
-          "x-ms-client-name": "pageWrite",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
-          "type": "string",
-          "enum": [
-            "update"
-          ],
-          "x-ms-enum": {
-            "name": "PageWriteType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=page&clear": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_ClearPages",
-        "description": "The Clear Pages operation clears a set of pages from a page blob",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThan"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The page range was cleared.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for the page blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "page"
-          ]
-        },
-        {
-          "name": "x-ms-page-write",
-          "x-ms-client-name": "pageWrite",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
-          "type": "string",
-          "enum": [
-            "clear"
-          ],
-          "x-ms-enum": {
-            "name": "PageWriteType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=page&update&fromUrl": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_UploadPagesFromURL",
-        "description": "The Upload Pages operation writes a range of pages to a page blob where the contents are read from a URL",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/SourceUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceRangeRequiredPutPageFromUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceContentMD5"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/RangeRequiredPutPageFromUrl"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThan"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The page range was written.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for the page blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "page"
-          ]
-        },
-        {
-          "name": "x-ms-page-write",
-          "x-ms-client-name": "pageWrite",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
-          "type": "string",
-          "enum": [
-            "update"
-          ],
-          "x-ms-enum": {
-            "name": "PageWriteType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=pagelist": {
-      "get": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_GetPageRanges",
-        "description": "The Get Page Ranges operation returns the list of valid page ranges for a page blob, version or snapshot of a page blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Information on the page blob was found.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "x-ms-blob-content-length": {
-                "x-ms-client-name": "BlobContentLength",
-                "type": "integer",
-                "format": "int64",
-                "description": "The size of the blob in bytes."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/PageList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "pagelist"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=pagelist&diff": {
-      "get": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_GetPageRangesDiff",
-        "description": "[Update] The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot or version.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/PrevSnapshot"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Information on the page blob was found.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "x-ms-blob-content-length": {
-                "x-ms-client-name": "BlobContentLength",
-                "type": "integer",
-                "format": "int64",
-                "description": "The size of the blob in bytes."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/PageList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "pagelist"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=properties&Resize": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_Resize",
-        "description": "Resize the Blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLengthRequired"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Blob was resized successfully",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=properties&UpdateSequenceNumber": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_UpdateSequenceNumber",
-        "description": "Update the sequence number of the blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/SequenceNumberAction"
-          },
-          {
-            "$ref": "#/parameters/BlobSequenceNumber"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The sequence numbers were updated successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=incrementalcopy": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_CopyIncremental",
-        "description": "The Copy Incremental operation copies a snapshot of the source page blob to a destination page blob. The snapshot is copied such that only the differential changes between the previously copied snapshot are transferred to the destination. The copied snapshots are complete copies of the original snapshot and can be read or copied from as usual. This API is supported since REST version 2016-05-31.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/CopySource"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The blob was copied.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "incrementalcopy"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=appendblock": {
-      "put": {
-        "tags": [
-          "appendblob"
-        ],
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "operationId": "AppendBlob_AppendBlock",
-        "description": "The Append Block operation commits a new block of data to the end of an existing append blob. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/ContentMD5"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionMaxSize"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionAppendPos"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-append-offset": {
-                "x-ms-client-name": "BlobAppendOffset",
-                "type": "string",
-                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "appendblock"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=appendblock&fromUrl": {
-      "put": {
-        "tags": [
-          "appendblob"
-        ],
-        "operationId": "AppendBlob_AppendBlockFromUrl",
-        "description": "The Append Block operation commits a new block of data to the end of an existing append blob where the contents are read from a source url. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/SourceUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceRange"
-          },
-          {
-            "$ref": "#/parameters/SourceContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionMaxSize"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionAppendPos"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "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."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-append-offset": {
-                "x-ms-client-name": "BlobAppendOffset",
-                "type": "string",
-                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "appendblock"
-          ]
-        }
-      ]
-    }
-  },
-  "definitions": {
-    "KeyInfo": {
-      "type": "object",
-      "required": [
-        "Start",
-        "Expiry"
-      ],
-      "description": "Key information",
-      "properties": {
-        "Start": {
-          "description": "The date-time the key is active in ISO 8601 UTC time",
-          "type": "string"
-        },
-        "Expiry": {
-          "description": "The date-time the key expires in ISO 8601 UTC time",
-          "type": "string"
-        }
-      }
-    },
-    "UserDelegationKey": {
-      "type": "object",
-      "required": [
-        "SignedOid",
-        "SignedTid",
-        "SignedStart",
-        "SignedExpiry",
-        "SignedService",
-        "SignedVersion",
-        "Value"
-      ],
-      "description": "A user delegation key",
-      "properties": {
-        "SignedOid": {
-          "description": "The Azure Active Directory object ID in GUID format.",
-          "type": "string"
-        },
-        "SignedTid": {
-          "description": "The Azure Active Directory tenant ID in GUID format",
-          "type": "string"
-        },
-        "SignedStart": {
-          "description": "The date-time the key is active",
-          "type": "string",
-          "format": "date-time"
-        },
-        "SignedExpiry": {
-          "description": "The date-time the key expires",
-          "type": "string",
-          "format": "date-time"
-        },
-        "SignedService": {
-          "description": "Abbreviation of the Azure Storage service that accepts the key",
-          "type": "string"
-        },
-        "SignedVersion": {
-          "description": "The service version that created the key",
-          "type": "string"
-        },
-        "Value": {
-          "description": "The key as a base64 string",
-          "type": "string"
-        }
-      }
-    },
-    "PublicAccessType": {
-      "type": "string",
-      "enum": [
-        "container",
-        "blob"
-      ],
-      "x-ms-enum": {
-        "name": "PublicAccessType",
-        "modelAsString": true
-      }
-    },
-    "CopyStatus": {
-      "type": "string",
-      "enum": [
-        "pending",
-        "success",
-        "aborted",
-        "failed"
-      ],
-      "x-ms-enum": {
-        "name": "CopyStatusType",
-        "modelAsString": false
-      }
-    },
-    "LeaseDuration": {
-      "type": "string",
-      "enum": [
-        "infinite",
-        "fixed"
-      ],
-      "x-ms-enum": {
-        "name": "LeaseDurationType",
-        "modelAsString": false
-      }
-    },
-    "LeaseState": {
-      "type": "string",
-      "enum": [
-        "available",
-        "leased",
-        "expired",
-        "breaking",
-        "broken"
-      ],
-      "x-ms-enum": {
-        "name": "LeaseStateType",
-        "modelAsString": false
-      }
-    },
-    "LeaseStatus": {
-      "type": "string",
-      "enum": [
-        "locked",
-        "unlocked"
-      ],
-      "x-ms-enum": {
-        "name": "LeaseStatusType",
-        "modelAsString": false
-      }
-    },
-    "StorageError": {
-      "type": "object",
-      "properties": {
-        "Code": {
-          "type": "string"
-        },
-        "Message": {
-          "type": "string"
-        }
-      }
-    },
-    "AccessPolicy": {
-      "type": "object",
-      "required": [
-        "Start",
-        "Expiry",
-        "Permission"
-      ],
-      "description": "An Access policy",
-      "properties": {
-        "Start": {
-          "description": "the date-time the policy is active",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Expiry": {
-          "description": "the date-time the policy expires",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Permission": {
-          "description": "the permissions for the acl policy",
-          "type": "string"
-        }
-      }
-    },
-    "AccessTier": {
-      "type": "string",
-      "enum": [
-        "P4",
-        "P6",
-        "P10",
-        "P20",
-        "P30",
-        "P40",
-        "P50",
-        "Hot",
-        "Cool",
-        "Archive"
-      ],
-      "x-ms-enum": {
-        "name": "AccessTier",
-        "modelAsString": true
-      }
-    },
-    "ArchiveStatus": {
-      "type": "string",
-      "enum": [
-        "rehydrate-pending-to-hot",
-        "rehydrate-pending-to-cool"
-      ],
-      "x-ms-enum": {
-        "name": "ArchiveStatus",
-        "modelAsString": true
-      }
-    },
-    "BlobItem": {
-      "xml": {
-        "name": "Blob"
-      },
-      "description": "An Azure Storage blob",
-      "type": "object",
-      "required": [
-        "Name",
-        "Deleted",
-        "Snapshot",
-        "VersionId",
-        "Properties"
-      ],
-      "properties": {
-        "Name": {
-          "type": "string"
-        },
-        "Deleted": {
-          "type": "boolean"
-        },
-        "Snapshot": {
-          "type": "string"
-        },
-        "VersionId": {
-          "type": "string"
-        },
-        "Properties": {
-          "$ref": "#/definitions/BlobProperties"
-        },
-        "Metadata": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "IsPrefix": {
-          "type": "boolean"
-        }
-      }
-    },
-    "BlobProperties": {
-      "xml": {
-        "name": "Properties"
-      },
-      "description": "Properties of a blob",
-      "type": "object",
-      "required": [
-        "Etag",
-        "Last-Modified"
-      ],
-      "properties": {
-        "Creation-Time": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "Last-Modified": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "Etag": {
-          "type": "string",
-          "format": "etag"
-        },
-        "Content-Length": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Size in bytes"
-        },
-        "Content-Type": {
-          "type": "string"
-        },
-        "Content-Encoding": {
-          "type": "string"
-        },
-        "Content-Language": {
-          "type": "string"
-        },
-        "Content-MD5": {
-          "type": "string",
-          "format": "byte"
-        },
-        "Content-Disposition": {
-          "type": "string"
-        },
-        "Cache-Control": {
-          "type": "string"
-        },
-        "x-ms-blob-sequence-number": {
-          "x-ms-client-name": "blobSequenceNumber",
-          "type": "integer",
-          "format": "int64"
-        },
-        "BlobType": {
-          "type": "string",
-          "enum": [
-            "BlockBlob",
-            "PageBlob",
-            "AppendBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        },
-        "LeaseStatus": {
-          "$ref": "#/definitions/LeaseStatus"
-        },
-        "LeaseState": {
-          "$ref": "#/definitions/LeaseState"
-        },
-        "LeaseDuration": {
-          "$ref": "#/definitions/LeaseDuration"
-        },
-        "CopyId": {
-          "type": "string"
-        },
-        "CopyStatus": {
-          "$ref": "#/definitions/CopyStatus"
-        },
-        "CopySource": {
-          "type": "string"
-        },
-        "CopyProgress": {
-          "type": "string"
-        },
-        "CopyCompletionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "CopyStatusDescription": {
-          "type": "string"
-        },
-        "ServerEncrypted": {
-          "type": "boolean"
-        },
-        "IncrementalCopy": {
-          "type": "boolean"
-        },
-        "DestinationSnapshot": {
-          "type": "string"
-        },
-        "DeletedTime": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "RemainingRetentionDays": {
-          "type": "integer"
-        },
-        "AccessTier": {
-          "$ref": "#/definitions/AccessTier"
-        },
-        "AccessTierInferred": {
-          "type": "boolean"
-        },
-        "ArchiveStatus": {
-          "$ref": "#/definitions/ArchiveStatus"
-        },
-        "CustomerProvidedKeySha256": {
-          "type": "string"
-        },
-        "AccessTierChangeTime": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        }
-      }
-    },
-    "ListBlobsFlatSegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "An enumeration of blobs",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "ContainerName",
-        "Prefix",
-        "Marker",
-        "MaxResults",
-        "Delimiter",
-        "Segment",
-        "NextMarker"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "ContainerName": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "Delimiter": {
-          "type": "string"
-        },
-        "Segment": {
-          "$ref": "#/definitions/BlobFlatListSegment"
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "ListBlobsHierarchySegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "An enumeration of blobs",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "ContainerName",
-        "Prefix",
-        "Marker",
-        "MaxResults",
-        "Delimiter",
-        "Segment",
-        "NextMarker"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "ContainerName": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "Delimiter": {
-          "type": "string"
-        },
-        "Segment": {
-          "$ref": "#/definitions/BlobHierarchyListSegment"
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "BlobFlatListSegment": {
-      "xml": {
-        "name": "Blobs"
-      },
-      "required": [
-        "BlobItems"
-      ],
-      "type": "object",
-      "properties": {
-        "BlobItems": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/BlobItem"
-          }
-        }
-      }
-    },
-    "BlobHierarchyListSegment": {
-      "xml": {
-        "name": "Blobs"
-      },
-      "type": "object",
-      "required": [
-        "BlobItems"
-      ],
-      "properties": {
-        "BlobPrefixes": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/BlobPrefix"
-          }
-        },
-        "BlobItems": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/BlobItem"
-          }
-        }
-      }
-    },
-    "BlobPrefix": {
-      "type": "object",
-      "required": [
-        "Name"
-      ],
-      "properties": {
-        "Name": {
-          "type": "string"
-        }
-      }
-    },
-    "Block": {
-      "type": "object",
-      "required": [
-        "Name",
-        "Size"
-      ],
-      "description": "Represents a single block in a block blob.  It describes the block's ID and size.",
-      "properties": {
-        "Name": {
-          "description": "The base64 encoded block ID.",
-          "type": "string"
-        },
-        "Size": {
-          "description": "The block size in bytes.",
-          "type": "integer"
-        }
-      }
-    },
-    "BlockList": {
-      "type": "object",
-      "properties": {
-        "CommittedBlocks": {
-          "xml": {
-            "wrapped": true
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Block"
-          }
-        },
-        "UncommittedBlocks": {
-          "xml": {
-            "wrapped": true
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Block"
-          }
-        }
-      }
-    },
-    "BlockLookupList": {
-      "type": "object",
-      "properties": {
-        "Committed": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "xml": {
-              "name": "Committed"
-            }
-          }
-        },
-        "Uncommitted": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "xml": {
-              "name": "Uncommitted"
-            }
-          }
-        },
-        "Latest": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "xml": {
-              "name": "Latest"
-            }
-          }
-        }
-      },
-      "xml": {
-        "name": "BlockList"
-      }
-    },
-    "ContainerItem": {
-      "xml": {
-        "name": "Container"
-      },
-      "type": "object",
-      "required": [
-        "Name",
-        "Properties"
-      ],
-      "description": "An Azure Storage container",
-      "properties": {
-        "Name": {
-          "type": "string"
-        },
-        "Properties": {
-          "$ref": "#/definitions/ContainerProperties"
-        },
-        "Metadata": {
-          "$ref": "#/definitions/ContainerMetadata"
-        }
-      }
-    },
-    "ContainerProperties": {
-      "type": "object",
-      "required": [
-        "Last-Modified",
-        "Etag"
-      ],
-      "description": "Properties of a container",
-      "properties": {
-        "Last-Modified": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "Etag": {
-          "type": "string",
-          "format": "etag"
-        },
-        "LeaseStatus": {
-          "$ref": "#/definitions/LeaseStatus"
-        },
-        "LeaseState": {
-          "$ref": "#/definitions/LeaseState"
-        },
-        "LeaseDuration": {
-          "$ref": "#/definitions/LeaseDuration"
-        },
-        "PublicAccess": {
-          "$ref": "#/definitions/PublicAccessType"
-        },
-        "HasImmutabilityPolicy": {
-          "type": "boolean"
-        },
-        "HasLegalHold": {
-          "type": "boolean"
-        }
-      }
-    },
-    "ListContainersSegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "An enumeration of containers",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "Prefix",
-        "MaxResults",
-        "NextMarker",
-        "ContainerItems"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "ContainerItems": {
-          "xml": {
-            "wrapped": true,
-            "name": "Containers"
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ContainerItem"
-          }
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "CorsRule": {
-      "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
-      "type": "object",
-      "required": [
-        "AllowedOrigins",
-        "AllowedMethods",
-        "AllowedHeaders",
-        "ExposedHeaders",
-        "MaxAgeInSeconds"
-      ],
-      "properties": {
-        "AllowedOrigins": {
-          "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
-          "type": "string"
-        },
-        "AllowedMethods": {
-          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
-          "type": "string"
-        },
-        "AllowedHeaders": {
-          "description": "the request headers that the origin domain may specify on the CORS request.",
-          "type": "string"
-        },
-        "ExposedHeaders": {
-          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
-          "type": "string"
-        },
-        "MaxAgeInSeconds": {
-          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
-          "type": "integer",
-          "minimum": 0
-        }
-      }
-    },
-    "ErrorCode": {
-      "description": "Error codes returned by the service",
-      "type": "string",
-      "enum": [
-        "AccountAlreadyExists",
-        "AccountBeingCreated",
-        "AccountIsDisabled",
-        "AuthenticationFailed",
-        "AuthorizationFailure",
-        "ConditionHeadersNotSupported",
-        "ConditionNotMet",
-        "EmptyMetadataKey",
-        "InsufficientAccountPermissions",
-        "InternalError",
-        "InvalidAuthenticationInfo",
-        "InvalidHeaderValue",
-        "InvalidHttpVerb",
-        "InvalidInput",
-        "InvalidMd5",
-        "InvalidMetadata",
-        "InvalidQueryParameterValue",
-        "InvalidRange",
-        "InvalidResourceName",
-        "InvalidUri",
-        "InvalidXmlDocument",
-        "InvalidXmlNodeValue",
-        "Md5Mismatch",
-        "MetadataTooLarge",
-        "MissingContentLengthHeader",
-        "MissingRequiredQueryParameter",
-        "MissingRequiredHeader",
-        "MissingRequiredXmlNode",
-        "MultipleConditionHeadersNotSupported",
-        "OperationTimedOut",
-        "OutOfRangeInput",
-        "OutOfRangeQueryParameterValue",
-        "RequestBodyTooLarge",
-        "ResourceTypeMismatch",
-        "RequestUrlFailedToParse",
-        "ResourceAlreadyExists",
-        "ResourceNotFound",
-        "ServerBusy",
-        "UnsupportedHeader",
-        "UnsupportedXmlNode",
-        "UnsupportedQueryParameter",
-        "UnsupportedHttpVerb",
-        "AppendPositionConditionNotMet",
-        "BlobAlreadyExists",
-        "BlobNotFound",
-        "BlobOverwritten",
-        "BlobTierInadequateForContentLength",
-        "BlockCountExceedsLimit",
-        "BlockListTooLong",
-        "CannotChangeToLowerTier",
-        "CannotVerifyCopySource",
-        "ContainerAlreadyExists",
-        "ContainerBeingDeleted",
-        "ContainerDisabled",
-        "ContainerNotFound",
-        "ContentLengthLargerThanTierLimit",
-        "CopyAcrossAccountsNotSupported",
-        "CopyIdMismatch",
-        "FeatureVersionMismatch",
-        "IncrementalCopyBlobMismatch",
-        "IncrementalCopyOfEralierVersionSnapshotNotAllowed",
-        "IncrementalCopySourceMustBeSnapshot",
-        "InfiniteLeaseDurationRequired",
-        "InvalidBlobOrBlock",
-        "InvalidBlobTier",
-        "InvalidBlobType",
-        "InvalidBlockId",
-        "InvalidBlockList",
-        "InvalidOperation",
-        "InvalidPageRange",
-        "InvalidSourceBlobType",
-        "InvalidSourceBlobUrl",
-        "InvalidVersionForPageBlobOperation",
-        "LeaseAlreadyPresent",
-        "LeaseAlreadyBroken",
-        "LeaseIdMismatchWithBlobOperation",
-        "LeaseIdMismatchWithContainerOperation",
-        "LeaseIdMismatchWithLeaseOperation",
-        "LeaseIdMissing",
-        "LeaseIsBreakingAndCannotBeAcquired",
-        "LeaseIsBreakingAndCannotBeChanged",
-        "LeaseIsBrokenAndCannotBeRenewed",
-        "LeaseLost",
-        "LeaseNotPresentWithBlobOperation",
-        "LeaseNotPresentWithContainerOperation",
-        "LeaseNotPresentWithLeaseOperation",
-        "MaxBlobSizeConditionNotMet",
-        "NoPendingCopyOperation",
-        "OperationNotAllowedOnIncrementalCopyBlob",
-        "PendingCopyOperation",
-        "PreviousSnapshotCannotBeNewer",
-        "PreviousSnapshotNotFound",
-        "PreviousSnapshotOperationNotSupported",
-        "SequenceNumberConditionNotMet",
-        "SequenceNumberIncrementTooLarge",
-        "SnapshotCountExceeded",
-        "SnaphotOperationRateExceeded",
-        "SnapshotsPresent",
-        "SourceConditionNotMet",
-        "SystemInUse",
-        "TargetConditionNotMet",
-        "UnauthorizedBlobOverwrite",
-        "BlobBeingRehydrated",
-        "BlobArchived",
-        "BlobNotArchived"
-      ],
-      "x-ms-enum": {
-        "name": "StorageErrorCode",
-        "modelAsString": true
-      }
-    },
-    "GeoReplication": {
-      "description": "Geo-Replication information for the Secondary Storage Service",
-      "type": "object",
-      "required": [
-        "Status",
-        "LastSyncTime"
-      ],
-      "properties": {
-        "Status": {
-          "description": "The status of the secondary location",
-          "type": "string",
-          "enum": [
-            "live",
-            "bootstrap",
-            "unavailable"
-          ],
-          "x-ms-enum": {
-            "name": "GeoReplicationStatusType",
-            "modelAsString": true
-          }
-        },
-        "LastSyncTime": {
-          "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
-          "type": "string",
-          "format": "date-time-rfc1123"
-        }
-      }
-    },
-    "Logging": {
-      "description": "Azure Analytics Logging settings.",
-      "type": "object",
-      "required": [
-        "Version",
-        "Delete",
-        "Read",
-        "Write",
-        "RetentionPolicy"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Delete": {
-          "description": "Indicates whether all delete requests should be logged.",
-          "type": "boolean"
-        },
-        "Read": {
-          "description": "Indicates whether all read requests should be logged.",
-          "type": "boolean"
-        },
-        "Write": {
-          "description": "Indicates whether all write requests should be logged.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "ContainerMetadata": {
-      "type": "object",
-      "xml": {
-        "name": "Metadata"
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "BlobMetadata": {
-      "type": "object",
-      "xml": {
-        "name": "Metadata"
-      },
-      "properties": {
-        "Encrypted": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        }
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "Metrics": {
-      "description": "a summary of request statistics grouped by API in hour or minute aggregates for blobs",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Enabled": {
-          "description": "Indicates whether metrics are enabled for the Blob service.",
-          "type": "boolean"
-        },
-        "IncludeAPIs": {
-          "description": "Indicates whether metrics should generate summary statistics for called API operations.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "PageList": {
-      "description": "the list of pages",
-      "type": "object",
-      "properties": {
-        "PageRange": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/PageRange"
-          }
-        },
-        "ClearRange": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ClearRange"
-          }
-        }
-      }
-    },
-    "PageRange": {
-      "type": "object",
-      "required": [
-        "Start",
-        "End"
-      ],
-      "properties": {
-        "Start": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "Start"
-          }
-        },
-        "End": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "End"
-          }
-        }
-      },
-      "xml": {
-        "name": "PageRange"
-      }
-    },
-    "ClearRange": {
-      "type": "object",
-      "required": [
-        "Start",
-        "End"
-      ],
-      "properties": {
-        "Start": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "Start"
-          }
-        },
-        "End": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "End"
-          }
-        }
-      },
-      "xml": {
-        "name": "ClearRange"
-      }
-    },
-    "RetentionPolicy": {
-      "description": "the retention policy which determines how long the associated data should persist",
-      "type": "object",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Enabled": {
-          "description": "Indicates whether a retention policy is enabled for the storage service",
-          "type": "boolean"
-        },
-        "Days": {
-          "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
-          "type": "integer",
-          "minimum": 1
-        }
-      }
-    },
-    "SignedIdentifier": {
-      "description": "signed identifier",
-      "type": "object",
-      "required": [
-        "Id",
-        "AccessPolicy"
-      ],
-      "properties": {
-        "Id": {
-          "type": "string",
-          "description": "a unique id"
-        },
-        "AccessPolicy": {
-          "$ref": "#/definitions/AccessPolicy"
-        }
-      }
-    },
-    "SignedIdentifiers": {
-      "description": "a collection of signed identifiers",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/SignedIdentifier",
-        "xml": {
-          "name": "SignedIdentifier"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "SignedIdentifiers"
-      }
-    },
-    "StaticWebsite": {
-      "description": "The properties that enable an account to host a static website",
-      "type": "object",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Enabled": {
-          "description": "Indicates whether this account is hosting a static website",
-          "type": "boolean"
-        },
-        "IndexDocument": {
-          "description": "The default name of the index page under each directory",
-          "type": "string"
-        },
-        "ErrorDocument404Path": {
-          "description": "The absolute path of the custom 404 page",
-          "type": "string"
-        }
-      }
-    },
-    "StorageServiceProperties": {
-      "description": "Storage Service Properties.",
-      "type": "object",
-      "properties": {
-        "Logging": {
-          "$ref": "#/definitions/Logging"
-        },
-        "HourMetrics": {
-          "$ref": "#/definitions/Metrics"
-        },
-        "MinuteMetrics": {
-          "$ref": "#/definitions/Metrics"
-        },
-        "Cors": {
-          "description": "The set of CORS rules.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/CorsRule"
-          },
-          "xml": {
-            "wrapped": true
-          }
-        },
-        "DefaultServiceVersion": {
-          "description": "The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions",
-          "type": "string"
-        },
-        "DeleteRetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        },
-        "StaticWebsite": {
-          "$ref": "#/definitions/StaticWebsite"
-        }
-      }
-    },
-    "StorageServiceStats": {
-      "description": "Stats for the storage service.",
-      "type": "object",
-      "properties": {
-        "GeoReplication": {
-          "$ref": "#/definitions/GeoReplication"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "Url": {
-      "name": "url",
-      "description": "The URL of the service account, container, or blob that is the targe of the desired operation.",
-      "required": true,
-      "type": "string",
-      "in": "path",
-      "x-ms-skip-url-encoding": true
-    },
-    "ApiVersionParameter": {
-      "name": "x-ms-version",
-      "x-ms-client-name": "version",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "description": "Specifies the version of the operation to use for this request.",
-      "enum": [
-        "2018-11-09"
-      ]
-    },
-    "Blob": {
-      "name": "blob",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+)*(?:\\.[a-zA-Z0-9]+){0,1}$",
-      "minLength": 1,
-      "maxLength": 1024,
-      "x-ms-parameter-location": "method",
-      "description": "The blob name."
-    },
-    "BlobCacheControl": {
-      "name": "x-ms-blob-cache-control",
-      "x-ms-client-name": "blobCacheControl",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's cache control. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobConditionAppendPos": {
-      "name": "x-ms-blob-condition-appendpos",
-      "x-ms-client-name": "appendPosition",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "append-position-access-conditions"
-      },
-      "description": "Optional conditional header, used only for the Append Block operation. A number indicating the byte offset to compare. Append Block will succeed only if the append position is equal to this number. If it is not, the request will fail with the AppendPositionConditionNotMet error (HTTP status code 412 - Precondition Failed)."
-    },
-    "BlobConditionMaxSize": {
-      "name": "x-ms-blob-condition-maxsize",
-      "x-ms-client-name": "maxSize",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "append-position-access-conditions"
-      },
-      "description": "Optional conditional header. The max length in bytes permitted for the append blob. If the Append Block operation would cause the blob to exceed that limit or if the blob size is already greater than the value specified in this header, the request will fail with MaxBlobSizeConditionNotMet error (HTTP status code 412 - Precondition Failed)."
-    },
-    "BlobPublicAccess": {
-      "name": "x-ms-blob-public-access",
-      "x-ms-client-name": "access",
-      "in": "header",
-      "required": false,
-      "x-ms-parameter-location": "method",
-      "description": "Specifies whether data in the container may be accessed publicly and the level of access",
-      "type": "string",
-      "enum": [
-        "container",
-        "blob"
-      ],
-      "x-ms-enum": {
-        "name": "PublicAccessType",
-        "modelAsString": true
-      }
-    },
-    "AccessTier": {
-      "name": "x-ms-access-tier",
-      "x-ms-client-name": "tier",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "enum": [
-        "P4",
-        "P6",
-        "P10",
-        "P20",
-        "P30",
-        "P40",
-        "P50",
-        "Hot",
-        "Cool",
-        "Archive"
-      ],
-      "x-ms-enum": {
-        "name": "AccessTier",
-        "modelAsString": true
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Indicates the tier to be set on the blob."
-    },
-    "BlobContentDisposition": {
-      "name": "x-ms-blob-content-disposition",
-      "x-ms-client-name": "blobContentDisposition",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's Content-Disposition header."
-    },
-    "BlobContentEncoding": {
-      "name": "x-ms-blob-content-encoding",
-      "x-ms-client-name": "blobContentEncoding",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's content encoding. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobContentLanguage": {
-      "name": "x-ms-blob-content-language",
-      "x-ms-client-name": "blobContentLanguage",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Set the blob's content language. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobContentLengthOptional": {
-      "name": "x-ms-blob-content-length",
-      "x-ms-client-name": "blobContentLength",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
-    },
-    "BlobContentLengthRequired": {
-      "name": "x-ms-blob-content-length",
-      "x-ms-client-name": "blobContentLength",
-      "in": "header",
-      "required": true,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
-    },
-    "BlobContentMD5": {
-      "name": "x-ms-blob-content-md5",
-      "x-ms-client-name": "blobContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded."
-    },
-    "BlobContentType": {
-      "name": "x-ms-blob-content-type",
-      "x-ms-client-name": "blobContentType",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's content type. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobSequenceNumber": {
-      "name": "x-ms-blob-sequence-number",
-      "x-ms-client-name": "blobSequenceNumber",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "default": 0,
-      "x-ms-parameter-location": "method",
-      "description": "Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1."
-    },
-    "BlockId": {
-      "name": "blockid",
-      "x-ms-client-name": "blockId",
-      "in": "query",
-      "type": "string",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "description": "A valid Base64 string value that identifies the block. Prior to encoding, the string must be less than or equal to 64 bytes in size. For a given blob, the length of the value specified for the blockid parameter must be the same size for each block."
-    },
-    "BlockListType": {
-      "name": "blocklisttype",
-      "x-ms-client-name": "listType",
-      "in": "query",
-      "required": true,
-      "default": "committed",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies whether to return the list of committed blocks, the list of uncommitted blocks, or both lists together.",
-      "type": "string",
-      "enum": [
-        "committed",
-        "uncommitted",
-        "all"
-      ],
-      "x-ms-enum": {
-        "name": "BlockListType",
-        "modelAsString": false
-      }
-    },
-    "Body": {
-      "name": "body",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "type": "object",
-        "format": "file"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Initial data"
-    },
-    "CacheControl": {
-      "name": "Cache-Control",
-      "x-ms-client-name": "cacheControl",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Cache control for given resource"
-    },
-    "ContainerAcl": {
-      "name": "containerAcl",
-      "in": "body",
-      "schema": {
-        "$ref": "#/definitions/SignedIdentifiers"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "the acls for the container"
-    },
-    "CopyId": {
-      "name": "copyid",
-      "x-ms-client-name": "copyId",
-      "in": "query",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The copy identifier provided in the x-ms-copy-id header of the original Copy Blob operation."
-    },
-    "ClientRequestId": {
-      "name": "x-ms-client-request-id",
-      "x-ms-client-name": "requestId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "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."
-    },
-    "ContainerName": {
-      "name": "containerName",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The container name."
-    },
-    "ContentCrc64": {
-      "name": "x-ms-content-crc64",
-      "x-ms-client-name": "transactionalContentCrc64",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "description": "Specify the transactional crc64 for the body, to be validated by the service."
-    },
-    "ContentLength": {
-      "name": "Content-Length",
-      "in": "header",
-      "required": true,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "The length of the request."
-    },
-    "ContentMD5": {
-      "name": "Content-MD5",
-      "x-ms-client-name": "transactionalContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "description": "Specify the transactional md5 for the body, to be validated by the service."
-    },
-    "CopySource": {
-      "name": "x-ms-copy-source",
-      "x-ms-client-name": "copySource",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "format": "url",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature."
-    },
-    "DeleteSnapshots": {
-      "name": "x-ms-delete-snapshots",
-      "x-ms-client-name": "deleteSnapshots",
-      "description": "Required if the blob has associated snapshots. Specify one of the following two options: include: Delete the base blob and all of its snapshots. only: Delete only the blob's snapshots and not the blob itself",
-      "x-ms-parameter-location": "method",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "enum": [
-        "include",
-        "only"
-      ],
-      "x-ms-enum": {
-        "name": "DeleteSnapshotsOptionType",
-        "modelAsString": false
-      }
-    },
-    "Delimiter": {
-      "name": "delimiter",
-      "description": "When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.",
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "in": "query",
-      "required": true
-    },
-    "EncryptionKey": {
-      "name": "x-ms-encryption-key",
-      "x-ms-client-name": "EncryptionKey",
-      "type": "string",
-      "in": "query",
-      "required": false,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
-    },
-    "EncryptionKeySha256": {
-      "name": "x-ms-encryption-key-sha256",
-      "x-ms-client-name": "encryptionKeySha256",
-      "type": "string",
-      "in": "query",
-      "required": false,
-      "x-ms-parameter-location": "method",
-      "description": "The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided."
-    },
-    "EncryptionAlgorithm": {
-      "name": "x-ms-encryption-algorithm",
-      "x-ms-client-name": "EncryptionAlgorithm",
-      "type": "string",
-      "in": "query",
-      "required": false,
-      "enum": [
-        "AES256"
-      ],
-      "x-ms-enum": {
-        "name": "EncryptionAlgorithmType",
-        "modelAsString": false
-      },
-      "x-ms-parameter-location": "method",
-      "description": "The algorithm used to produce the encryption key hash. Currently, the only accepted value is \"AES256\". Must be provided if the x-ms-encryption-key header is provided."
-    },
-    "GetRangeContentMD5": {
-      "name": "x-ms-range-get-content-md5",
-      "x-ms-client-name": "rangeGetContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "boolean",
-      "x-ms-parameter-location": "method",
-      "description": "When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size."
-    },
-    "IfMatch": {
-      "name": "If-Match",
-      "x-ms-client-name": "ifMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs with a matching value."
-    },
-    "IfModifiedSince": {
-      "name": "If-Modified-Since",
-      "x-ms-client-name": "ifModifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
-    },
-    "IfNoneMatch": {
-      "name": "If-None-Match",
-      "x-ms-client-name": "ifNoneMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs without a matching value."
-    },
-    "IfUnmodifiedSince": {
-      "name": "If-Unmodified-Since",
-      "x-ms-client-name": "ifUnmodifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
-    },
-    "IfSequenceNumberEqualTo": {
-      "name": "x-ms-if-sequence-number-eq",
-      "x-ms-client-name": "ifSequenceNumberEqualTo",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "sequence-number-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has the specified sequence number."
-    },
-    "IfSequenceNumberLessThan": {
-      "name": "x-ms-if-sequence-number-lt",
-      "x-ms-client-name": "ifSequenceNumberLessThan",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "sequence-number-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has a sequence number less than the specified."
-    },
-    "IfSequenceNumberLessThanOrEqualTo": {
-      "name": "x-ms-if-sequence-number-le",
-      "x-ms-client-name": "ifSequenceNumberLessThanOrEqualTo",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "sequence-number-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has a sequence number less than or equal to the specified."
-    },
-    "KeyInfo": {
-      "name": "KeyInfo",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/KeyInfo"
-      }
-    },
-    "ListBlobsInclude": {
-      "name": "include",
-      "in": "query",
-      "required": false,
-      "type": "array",
-      "collectionFormat": "csv",
-      "items": {
-        "type": "string",
-        "enum": [
-          "copy",
-          "deleted",
-          "metadata",
-          "snapshots",
-          "uncommittedblobs"
-        ],
-        "x-ms-enum": {
-          "name": "ListBlobsIncludeItem",
-          "modelAsString": false
-        }
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Include this parameter to specify one or more datasets to include in the response."
-    },
-    "ListContainersInclude": {
-      "name": "include",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "enum": [
-        "metadata"
-      ],
-      "x-ms-enum": {
-        "name": "ListContainersIncludeType",
-        "modelAsString": false
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Include this parameter to specify that the container's metadata be returned as part of the response body."
-    },
-    "LeaseBreakPeriod": {
-      "name": "x-ms-lease-break-period",
-      "x-ms-client-name": "breakPeriod",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "x-ms-parameter-location": "method",
-      "description": "For a break operation, proposed duration the lease should continue before it is broken, in seconds, between 0 and 60. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately."
-    },
-    "LeaseDuration": {
-      "name": "x-ms-lease-duration",
-      "x-ms-client-name": "duration",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change."
-    },
-    "LeaseIdOptional": {
-      "name": "x-ms-lease-id",
-      "x-ms-client-name": "leaseId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "lease-access-conditions"
-      },
-      "description": "If specified, the operation only succeeds if the resource's lease is active and matches this ID."
-    },
-    "LeaseIdRequired": {
-      "name": "x-ms-lease-id",
-      "x-ms-client-name": "leaseId",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the current lease ID on the resource."
-    },
-    "Marker": {
-      "name": "marker",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
-      "x-ms-parameter-location": "method"
-    },
-    "MaxResults": {
-      "name": "maxresults",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 1,
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
-    },
-    "Metadata": {
-      "name": "x-ms-meta",
-      "x-ms-client-name": "metadata",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.",
-      "x-ms-header-collection-prefix": "x-ms-meta-"
-    },
-    "Prefix": {
-      "name": "prefix",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "Filters the results to return only containers whose name begins with the specified prefix.",
-      "x-ms-parameter-location": "method"
-    },
-    "PrevSnapshot": {
-      "name": "prevsnapshot",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Optional in version 2015-07-08 and newer. The prevsnapshot parameter is a DateTime value that specifies that the response will contain only pages that were changed between target blob and previous snapshot. Changed pages include both updated and cleared pages. The target blob may be a snapshot, as long as the snapshot specified by prevsnapshot is the older of the two. Note that incremental snapshots are currently supported only for blobs created on or after January 1, 2016."
-    },
-    "ProposedLeaseIdOptional": {
-      "name": "x-ms-proposed-lease-id",
-      "x-ms-client-name": "proposedLeaseId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
-    },
-    "ProposedLeaseIdRequired": {
-      "name": "x-ms-proposed-lease-id",
-      "x-ms-client-name": "proposedLeaseId",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
-    },
-    "Range": {
-      "name": "x-ms-range",
-      "x-ms-client-name": "range",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Return only the bytes of the blob in the specified range."
-    },
-    "RangeRequiredPutPageFromUrl": {
-      "name": "x-ms-range",
-      "x-ms-client-name": "range",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required."
-    },
-    "SequenceNumberAction": {
-      "name": "x-ms-sequence-number-action",
-      "x-ms-client-name": "sequenceNumberAction",
-      "in": "header",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "description": "Required if the x-ms-blob-sequence-number header is set for the request. This property applies to page blobs only. This property indicates how the service should modify the blob's sequence number",
-      "type": "string",
-      "enum": [
-        "max",
-        "update",
-        "increment"
-      ],
-      "x-ms-enum": {
-        "name": "SequenceNumberActionType",
-        "modelAsString": false
-      }
-    },
-    "Snapshot": {
-      "name": "snapshot",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob\">Creating a Snapshot of a Blob.</a>"
-    },
-    "SourceContentMD5": {
-      "name": "x-ms-source-content-md5",
-      "x-ms-client-name": "sourceContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "description": "Specify the md5 calculated for the range of bytes that must be read from the copy source."
-    },
-    "SourceRange": {
-      "name": "x-ms-source-range",
-      "x-ms-client-name": "sourceRange",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Bytes of source data in the specified range."
-      },
-      "SourceRangeRequiredPutPageFromUrl": {
-        "name": "x-ms-source-range",
-        "x-ms-client-name": "sourceRange",
-        "in": "header",
-        "required": true,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "description": "Bytes of source data in the specified range. The length of this range should match the ContentLength header and x-ms-range/Range destination range header."
-    },
-    "SourceIfMatch": {
-      "name": "x-ms-source-if-match",
-      "x-ms-client-name": "sourceIfMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs with a matching value."
-    },
-    "SourceIfModifiedSince": {
-      "name": "x-ms-source-if-modified-since",
-      "x-ms-client-name": "sourceIfModifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
-    },
-    "SourceIfNoneMatch": {
-      "name": "x-ms-source-if-none-match",
-      "x-ms-client-name": "sourceIfNoneMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs without a matching value."
-    },
-    "SourceIfUnmodifiedSince": {
-      "name": "x-ms-source-if-unmodified-since",
-      "x-ms-client-name": "sourceIfUnmodifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
-    },
-      "SourceLeaseId": {
-        "name": "x-ms-source-lease-id",
-        "x-ms-client-name": "sourceLeaseId",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "description": "A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match."
-      },
-    "SourceUrl": {
-      "name": "x-ms-copy-source",
-      "x-ms-client-name": "sourceUrl",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "format": "url",
-      "x-ms-parameter-location": "method",
-      "description": "Specify a URL to the copy source."
-    },
-    "StorageServiceProperties": {
-      "name": "StorageServiceProperties",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/StorageServiceProperties"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "The StorageService properties."
-    },
-    "Timeout": {
-      "name": "timeout",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 0,
-      "x-ms-parameter-location": "method",
-      "description": "The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations\">Setting Timeouts for Blob Service Operations.</a>"
-      },
-      "VersionId": {
-        "name": "versionid",
-        "x-ms-client-name": "versionId",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "description": "The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve."
-      },
-      "XMsCacheControl": {
-        "name": "x-ms-cache-control",
-        "x-ms-client-name": "cacheControl",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Cache control for given resource"
-      },
-      "XMsContentType": {
-        "name": "x-ms-content-type",
-        "x-ms-client-name": "contentType",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content type for given resource"
-      },
-      "XMsContentEncoding": {
-        "name": "x-ms-content-encoding",
-        "x-ms-client-name": "contentEncoding",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content encoding for given resource"
-      },
-      "XMsContentLanguage": {
-        "name": "x-ms-content-language",
-        "x-ms-client-name": "contentLanguage",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content language for given resource"
-      },
-      "XMsContentDisposition": {
-        "name": "x-ms-content-disposition",
-        "x-ms-client-name": "contentDisposition",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content disposition for given resource"
-    }
-  }
-}
diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml
index e50ea1d13cd8..7eb369b5174a 100644
--- a/sdk/storage/azure-storage-common/pom.xml
+++ b/sdk/storage/azure-storage-common/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-common</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-common</name>
+  <name>Microsoft Azure common module for Storage</name>
+  <description>This module contains common code based for all Microsoft Azure Storage client libraries.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/storage/azure-storage-file/pom.xml b/sdk/storage/azure-storage-file/pom.xml
index 91058c7dcdb7..f12383df2f0b 100644
--- a/sdk/storage/azure-storage-file/pom.xml
+++ b/sdk/storage/azure-storage-file/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-file</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-file</name>
+  <name>Microsoft Azure client library for File Storage</name>
+  <description>This module contains client library for Microsoft Azure File Storage.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
index 39584a1738f9..61cd8b5218c9 100644
--- a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
+++ b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
@@ -67,14 +67,15 @@ public AzureFileStorageBuilder pipeline(HttpPipeline pipeline) {
      * @return an instance of AzureFileStorageImpl.
      */
     public AzureFileStorageImpl build() {
+        if (version == null) {
+            this.version = "2018-11-09";
+        }
         if (pipeline == null) {
             this.pipeline = RestProxy.createDefaultPipeline();
         }
         AzureFileStorageImpl client = new AzureFileStorageImpl(pipeline);
         if (this.version != null) {
             client.setVersion(this.version);
-        } else {
-            client.setVersion("2018-11-09");
         }
         if (this.url != null) {
             client.setUrl(this.url);
diff --git a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java
index 54e5f47f763f..5d154709eec4 100644
--- a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java
+++ b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java
@@ -29,9 +29,11 @@ public String getVersion() {
      * Sets Specifies the version of the operation to use for this request.
      *
      * @param version the version value.
+     * @return the service client itself.
      */
-    void setVersion(String version) {
+    AzureFileStorageImpl setVersion(String version) {
         this.version = version;
+        return this;
     }
 
     /**
@@ -52,9 +54,11 @@ public String getUrl() {
      * Sets The URL of the service account, share, directory or file that is the target of the desired operation.
      *
      * @param url the url value.
+     * @return the service client itself.
      */
-    void setUrl(String url) {
+    AzureFileStorageImpl setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     /**
diff --git a/sdk/storage/azure-storage-file/swagger/README.md b/sdk/storage/azure-storage-file/swagger/README.md
new file mode 100644
index 000000000000..e27a308da24c
--- /dev/null
+++ b/sdk/storage/azure-storage-file/swagger/README.md
@@ -0,0 +1,446 @@
+# Azure File Storage for Java
+
+> see https://aka.ms/autorest
+
+### Setup
+```ps
+cd C:\work
+git clone --recursive https://github.com/Azure/autorest.java/
+cd autorest.java
+git checkout v3
+npm install
+cd ..
+git clone --recursive https://github.com/jianghaolu/autorest.modeler/
+cd autorest.modeler
+git checkout headerprefixfix
+npm install
+```
+
+### Generation
+```ps
+cd <swagger-folder>
+autorest --use=C:/work/autorest.java --use=C:/work/autorest.modeler --version=2.0.4280
+```
+
+### Code generation settings
+``` yaml
+input-file: ./file-2018-11-09.json
+java: true
+output-folder: ../
+namespace: com.azure.storage.file
+enable-xml: true
+generate-client-interfaces: false
+sync-methods: none
+license-header: MICROSOFT_MIT_SMALL
+add-context-parameter: true
+```
+
+### Query Parameters
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters
+  transform: >
+    if (!$.DirectoryPath) {
+        $.DirectoryPath = {
+            "name": "directoryPath",
+            "in": "path",
+            "description": "The path of the target directory.",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-skip-url-encoding": false
+        };
+    }
+    if (!$.FilePath) {
+        $.FilePath = {
+            "name": "filePath",
+            "in": "path",
+            "description": "The path of the target file.",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-skip-url-encoding": false
+        };
+    }
+    if (!$.ShareName) {
+        $.ShareName = {
+            "name": "shareName",
+            "in": "path",
+            "description": "The name of the target share.",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        };
+    }
+```
+
+### FileServiceProperties
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions
+  transform: >
+    if (!$.FileServiceProperties) {
+        const props = $.FileServiceProperties = $.StorageServiceProperties;
+        props.xml = { "name": "StorageServiceProperties" };
+        delete $.StorageServiceProperties;
+    }
+- from: swagger-document
+  where: $.parameters
+  transform: >
+    if (!$.FileServiceProperties) {
+        const props = $.FileServiceProperties = $.StorageServiceProperties;
+        props.name = "FileServiceProperties";
+        props.description = "The FileStorage properties.";
+        props.schema = { "$ref": props.schema.$ref.replace(/[#].*$/, "#/definitions/FileServiceProperties") };
+        delete $.StorageServiceProperties;
+    }
+- from: swagger-document
+  where: $["x-ms-paths"]["/?restype=service&comp=properties"]
+  transform: >
+    const param = $.put.parameters[0];
+    if (param && param["$ref"] && param["$ref"].endsWith("StorageServiceProperties")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/FileServiceProperties");
+        $.put.parameters[0] = { "$ref": path };
+    }
+    const def = $.get.responses["200"].schema;
+    if (def && def["$ref"] && def["$ref"].endsWith("StorageServiceProperties")) {
+        const path = def["$ref"].replace(/[#].*$/, "#/definitions/FileServiceProperties");
+        $.get.responses["200"].schema = { "$ref": path };
+    }
+```
+
+### /{shareName}?restype=share
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=properties"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=snapshot
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=snapshot"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=acl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=acl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+
+### /{shareName}?restype=share&comp=stats
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=stats"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}/{directoryPath}?restype=directory
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?restype=directory"]) {
+        const op = $["/{shareName}/{directoryPath}?restype=directory"] = $["/{shareName}/{directory}?restype=directory"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        op.delete.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.delete.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?restype=directory"];
+    }
+```
+
+### /{shareName}/{directoryPath}?restype=directory&comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?restype=directory&comp=metadata"]) {
+        const op = $["/{shareName}/{directoryPath}?restype=directory&comp=metadata"] = $["/{shareName}/{directory}?restype=directory&comp=metadata"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?restype=directory&comp=metadata"];
+    }
+```
+
+### /{shareName}/{directoryPath}?restype=directory&comp=list
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?restype=directory&comp=list"]) {
+        const op = $["/{shareName}/{directoryPath}?restype=directory&comp=list"] = $["/{shareName}/{directory}?restype=directory&comp=list"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?restype=directory&comp=list"];
+    }
+```
+
+### /{shareName}/{directoryPath}?comp=listhandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?comp=listhandles"]) {
+        const op = $["/{shareName}/{directoryPath}?comp=listhandles"] = $["/{shareName}/{directory}?comp=listhandles"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?comp=listhandles"];
+    }
+```
+
+### /{shareName}/{directoryPath}?comp=forceclosehandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?comp=forceclosehandles"]) {
+        const op = $["/{shareName}/{directoryPath}?comp=forceclosehandles"] = $["/{shareName}/{directory}?comp=forceclosehandles"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?comp=forceclosehandles"];
+    }
+```
+
+### /{shareName}/{filePath}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}"]) {
+        const op = $["/{shareName}/{filePath}"] = $["/{shareName}/{directory}/{fileName}"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        op.head.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.head.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete op.head.responses.default.schema;
+        op.delete.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.delete.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=properties"]) {
+        const op = $["/{shareName}/{filePath}?comp=properties"] = $["/{shareName}/{directory}/{fileName}?comp=properties"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=properties"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=metadata"]) {
+        const op = $["/{shareName}/{filePath}?comp=metadata"] = $["/{shareName}/{directory}/{fileName}?comp=metadata"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=metadata"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=range
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=range"]) {
+        const op = $["/{shareName}/{filePath}?comp=range"] = $["/{shareName}/{directory}/{fileName}?comp=range"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=range"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=rangelist
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=rangelist"]) {
+        const op = $["/{shareName}/{filePath}?comp=rangelist"] = $["/{shareName}/{directory}/{fileName}?comp=rangelist"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=rangelist"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=copy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=copy"]) {
+        const op = $["/{shareName}/{filePath}?comp=copy"] = $["/{shareName}/{directory}/{fileName}?comp=copy"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=copy"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=copy&copyid={CopyId}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=copy&copyid={CopyId}"]) {
+        const op = $["/{shareName}/{filePath}?comp=copy&copyid={CopyId}"] = $["/{shareName}/{directory}/{fileName}?comp=copy&copyid={CopyId}"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=copy&copyid={CopyId}"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=listhandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=listhandles"]) {
+        const op = $["/{shareName}/{filePath}?comp=listhandles"] = $["/{shareName}/{directory}/{fileName}?comp=listhandles"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=listhandles"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=forceclosehandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=forceclosehandles"]) {
+        const op = $["/{shareName}/{filePath}?comp=forceclosehandles"] = $["/{shareName}/{directory}/{fileName}?comp=forceclosehandles"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=forceclosehandles"];
+    }
+```
+
+### ShareProperties
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions
+  transform: >
+    if (!$.ShareProperties.properties.Metadata) {
+        const path = $.ShareItem.properties.Metadata.$ref;
+        $.ShareProperties.properties.Metadata = { "$ref": path };
+    }
+```
+
+### ShareUsageBytes
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ShareStats.properties.ShareUsageBytes
+  transform: >
+    $.description = "The approximate size of the data stored in bytes, rounded up to the nearest gigabyte. Note that this value may not include all recently created or recently resized files.";
+    $.format = "int64";
+```
+
+### ApiVersionParameter
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.ApiVersionParameter
+  transform: >
+    $.enum = [ "2018-11-09" ];
+```
diff --git a/sdk/storage/azure-storage-file/swagger/file.json b/sdk/storage/azure-storage-file/swagger/file-2018-11-09.json
similarity index 95%
rename from sdk/storage/azure-storage-file/swagger/file.json
rename to sdk/storage/azure-storage-file/swagger/file-2018-11-09.json
index 26efc70f6af0..fbe80a1d8198 100644
--- a/sdk/storage/azure-storage-file/swagger/file.json
+++ b/sdk/storage/azure-storage-file/swagger/file-2018-11-09.json
@@ -44,7 +44,7 @@
                 "operationId": "Service_SetProperties",
                 "description": "Sets properties for a storage account's File service endpoint, including properties for Storage Analytics metrics and CORS (Cross-Origin Resource Sharing) rules.",
                 "parameters": [{
-                        "$ref": "#/parameters/FileServiceProperties"
+                        "$ref": "#/parameters/StorageServiceProperties"
                     },
                     {
                         "$ref": "#/parameters/Timeout"
@@ -112,7 +112,7 @@
                             }
                         },
                         "schema": {
-                            "$ref": "#/definitions/FileServiceProperties"
+                            "$ref": "#/definitions/StorageServiceProperties"
                         }
                     },
                     "default": {
@@ -228,11 +228,7 @@
                 ],
                 "operationId": "Share_Create",
                 "description": "Creates a new share under the specified account. If the share with the same name already exists, the operation fails.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -296,11 +292,7 @@
                 ],
                 "operationId": "Share_GetProperties",
                 "description": "Returns all user-defined metadata and system properties for the specified share or share snapshot. The data returned does not include the share's list of files.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -372,11 +364,7 @@
                 ],
                 "operationId": "Share_Delete",
                 "description": "Operation marks the specified share or share snapshot for deletion. The share or share snapshot and any files contained within it are later deleted during garbage collection.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -441,11 +429,7 @@
                 ],
                 "operationId": "Share_CreateSnapshot",
                 "description": "Creates a read-only snapshot of a share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -532,11 +516,7 @@
                 ],
                 "operationId": "Share_SetQuota",
                 "description": "Sets quota for the specified share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -618,11 +598,7 @@
                 ],
                 "operationId": "Share_SetMetadata",
                 "description": "Sets one or more user-defined name-value pairs for the specified share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -704,11 +680,7 @@
                 ],
                 "operationId": "Share_GetAccessPolicy",
                 "description": "Returns information about stored access policies specified on the share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -769,11 +741,7 @@
                 ],
                 "operationId": "Share_SetAccessPolicy",
                 "description": "Sets a stored access policy for use with shared access signatures.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareAcl"
                     },
                     {
@@ -855,11 +823,7 @@
                 ],
                 "operationId": "Share_GetStatistics",
                 "description": "Retrieves statistics related to the share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -934,21 +898,14 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?restype=directory": {
+        "/{shareName}/{directory}?restype=directory": {
             "put": {
                 "tags": [
                     "directory"
                 ],
                 "operationId": "Directory_Create",
                 "description": "Creates a new directory under the specified share or parent directory.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1014,14 +971,7 @@
                 ],
                 "operationId": "Directory_GetProperties",
                 "description": "Returns all system properties for the specified directory, and can also be used to check the existence of a directory. The data returned does not include the files in the directory or any subdirectories.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -1093,14 +1043,7 @@
                 ],
                 "operationId": "Directory_Delete",
                 "description": "Removes the specified empty directory. Note that the directory must be empty before it can be deleted.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1152,21 +1095,14 @@
                 ]
             }]
         },
-        "/{shareName}/{directoryPath}?restype=directory&comp=metadata": {
+        "/{shareName}/{directory}?restype=directory&comp=metadata": {
             "put": {
                 "tags": [
                     "directory"
                 ],
                 "operationId": "Directory_SetMetadata",
                 "description": "Updates user defined metadata for the specified directory.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1241,7 +1177,7 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?restype=directory&comp=list": {
+        "/{shareName}/{directory}?restype=directory&comp=list": {
             "get": {
                 "tags": [
                     "directory"
@@ -1249,12 +1185,6 @@
                 "operationId": "Directory_ListFilesAndDirectoriesSegment",
                 "description": "Returns a list of files or directories under the specified share or directory. It lists the contents only for a single level of the directory hierarchy.",
                 "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
                     {
                         "$ref": "#/parameters/Prefix"
                     },
@@ -1339,7 +1269,7 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?comp=listhandles": {
+        "/{shareName}/{directory}?comp=listhandles": {
             "get":{
                 "tags": [
                     "directory"
@@ -1347,12 +1277,6 @@
                 "operationId": "Directory_ListHandles",
                 "description": "Lists handles for directory.",
                 "parameters":[
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
                     {
                         "$ref": "#/parameters/Marker"
                     },
@@ -1425,7 +1349,7 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?comp=forceclosehandles": {
+        "/{shareName}/{directory}?comp=forceclosehandles": {
             "put": {
                 "tags": [
                     "directory"
@@ -1433,12 +1357,6 @@
                 "operationId": "Directory_ForceCloseHandles",
                 "description": "Closes all handles open for given directory.",
                 "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
                     {
                         "$ref": "#/parameters/Timeout"
                     },
@@ -1514,21 +1432,14 @@
             }
         ]
         },
-        "/{shareName}/{filePath}": {
+        "/{shareName}/{directory}/{fileName}": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_Create",
                 "description": "Creates a new file or replaces a file. Note it only initializes the file with no content.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1624,14 +1535,7 @@
                 ],
                 "operationId": "File_Download",
                 "description": "Reads or downloads a file from the system, including its metadata and properties.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1925,14 +1829,7 @@
                 ],
                 "operationId": "File_GetProperties",
                 "description": "Returns all user-defined metadata, standard HTTP properties, and system properties for the file. It does not return the content of the file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -2070,6 +1967,9 @@
                                 "x-ms-client-name": "ErrorCode",
                                 "type": "string"
                             }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
                         }
                     }
                 }
@@ -2080,14 +1980,7 @@
                 ],
                 "operationId": "File_Delete",
                 "description": "removes the file from the storage account.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2133,21 +2026,14 @@
 
             ]
         },
-        "/{shareName}/{filePath}?comp=properties": {
+        "/{shareName}/{directory}/{fileName}?comp=properties": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_SetHTTPHeaders",
                 "description": "Sets HTTP headers on the file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2241,21 +2127,14 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=metadata": {
+        "/{shareName}/{directory}/{fileName}?comp=metadata": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_SetMetadata",
                 "description": "Updates user-defined metadata for the specified file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2320,7 +2199,7 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=range": {
+        "/{shareName}/{directory}/{fileName}?comp=range": {
             "put": {
                 "tags": [
                     "file"
@@ -2330,14 +2209,7 @@
                 "consumes": [
                     "application/octet-stream"
                 ],
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/OptionalBody"
                     },
                     {
@@ -2443,21 +2315,14 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=rangelist": {
+        "/{shareName}/{directory}/{fileName}?comp=rangelist": {
             "get": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_GetRangeList",
                 "description": "Returns the list of valid ranges for a file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -2539,21 +2404,14 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=copy": {
+        "/{shareName}/{directory}/{fileName}?comp=copy": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_StartCopy",
                 "description": "Copies a blob or file to a destination file within the storage account.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2635,21 +2493,14 @@
 
             ]
         },
-        "/{shareName}/{filePath}?comp=copy&copyid={CopyId}": {
+        "/{shareName}/{directory}/{fileName}?comp=copy&copyid={CopyId}": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_AbortCopy",
                 "description": "Aborts a pending Copy File operation, and leaves a destination file with zero length and full metadata.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/CopyId"
                     },
                     {
@@ -2707,7 +2558,7 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=listhandles": {
+        "/{shareName}/{directory}/{fileName}?comp=listhandles": {
             "get":{
                 "tags": [
                     "file"
@@ -2715,12 +2566,6 @@
                 "operationId": "File_ListHandles",
                 "description": "Lists handles for file",
                 "parameters":[
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
                     {
                         "$ref": "#/parameters/Marker"
                     },
@@ -2790,7 +2635,7 @@
                 }
             ]
         },
-        "/{shareName}/{filePath}?comp=forceclosehandles": {
+        "/{shareName}/{directory}/{fileName}?comp=forceclosehandles": {
             "put": {
                 "tags": [
                     "file"
@@ -2798,12 +2643,6 @@
                 "operationId": "File_ForceCloseHandles",
                 "description": "Closes all handles open for given file",
                 "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
                     {
                         "$ref": "#/parameters/Timeout"
                     },
@@ -3383,9 +3222,6 @@
                 },
                 "Quota": {
                     "type": "integer"
-                },
-                "Metadata": {
-                    "$ref": "#/definitions/Metadata"
                 }
             }
         },
@@ -3397,9 +3233,8 @@
             ],
             "properties": {
                 "ShareUsageBytes": {
-                    "description": "The approximate size of the data stored in bytes, rounded up to the nearest gigabyte. Note that this value may not include all recently created or recently resized files.",
-                    "type": "integer",
-                    "format": "int64"
+                    "description": "The approximate size of the data stored in bytes. Note that this value may not include all recently created or recently resized files.",
+                    "type": "integer"
                 }
             }
         },
@@ -3434,7 +3269,7 @@
                 "name": "SignedIdentifiers"
             }
         },
-        "FileServiceProperties": {
+        "StorageServiceProperties": {
             "description": "Storage service properties.",
             "type": "object",
             "properties": {
@@ -3456,9 +3291,6 @@
                         "wrapped": true
                     }
                 }
-            },
-            "xml": {
-                "name": "StorageServiceProperties"
             }
         }
     },
@@ -3469,10 +3301,7 @@
             "in": "header",
             "description": "Specifies the version of the operation to use for this request.",
             "required": true,
-            "type": "string",
-            "enum": [
-                "2018-11-09"
-            ]
+            "type": "string"
         },
         "ContentLength": {
             "name": "Content-Length",
@@ -3539,15 +3368,6 @@
             },
             "x-ms-parameter-location": "method"
         },
-        "DirectoryPath": {
-            "name": "directoryPath",
-            "in": "path",
-            "description": "The path of the target directory.",
-            "required": true,
-            "type": "string",
-            "x-ms-parameter-location": "method",
-            "x-ms-skip-url-encoding": false
-        },
         "FileCacheControl": {
             "name": "x-ms-cache-control",
             "x-ms-client-name": "fileCacheControl",
@@ -3621,15 +3441,6 @@
                 "name": "file-HTTP-headers"
             }
         },
-        "FilePath": {
-            "name": "filePath",
-            "in": "path",
-            "description": "The path of the target file.",
-            "required": true,
-            "type": "string",
-            "x-ms-parameter-location": "method",
-            "x-ms-skip-url-encoding": false
-        },
         "FileType": {
             "name": "x-ms-type",
             "x-ms-client-name": "fileTypeConstant",
@@ -3761,14 +3572,6 @@
             },
             "x-ms-parameter-location": "method"
         },
-        "ShareName": {
-            "name": "shareName",
-            "in": "path",
-            "description": "The name of the target share.",
-            "required": true,
-            "type": "string",
-            "x-ms-parameter-location": "method"
-        },
         "ShareQuota": {
             "name": "x-ms-share-quota",
             "x-ms-client-name": "quota",
@@ -3787,13 +3590,13 @@
             "type": "string",
             "x-ms-parameter-location": "method"
         },
-        "FileServiceProperties": {
-            "name": "FileServiceProperties",
+        "StorageServiceProperties": {
+            "name": "StorageServiceProperties",
             "in": "body",
-            "description": "The FileStorage properties.",
+            "description": "The StorageService properties.",
             "required": true,
             "schema": {
-                "$ref": "#/definitions/FileServiceProperties"
+                "$ref": "#/definitions/StorageServiceProperties"
             },
             "x-ms-parameter-location": "method"
         },
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index 8956e06c351c..f67c81028a75 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-queue</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-queue</name>
+  <name>Microsoft Azure client library for Queue Storage</name>
+  <description>This module contains client library for Microsoft Azure Queue Storage.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
@@ -53,20 +54,11 @@
       <version>1.0.0-preview.4</version>
       <scope>test</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.spockframework/spock-core -->
     <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-identity</artifactId>
-      <version>1.0.0-preview.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>1.3-groovy-2.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -74,10 +66,5 @@
       <artifactId>reactor-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>adal4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
index 659d128dc243..86931937896f 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -24,6 +24,7 @@
 import com.azure.storage.queue.models.SignedIdentifier;
 import com.azure.storage.queue.models.StorageErrorException;
 import com.azure.storage.queue.models.UpdatedMessage;
+import java.util.Objects;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -62,6 +63,7 @@ public final class QueueAsyncClient {
      * @param queueName Name of the queue
      */
     QueueAsyncClient(AzureQueueStorageImpl client, String queueName) {
+        Objects.requireNonNull(queueName);
         this.queueName = queueName;
 
         this.client = new AzureQueueStorageBuilder().pipeline(client.getHttpPipeline())
@@ -79,6 +81,7 @@ public final class QueueAsyncClient {
      * @param queueName Name of the queue
      */
     QueueAsyncClient(URL endpoint, HttpPipeline httpPipeline, String queueName) {
+        Objects.requireNonNull(queueName);
         this.queueName = queueName;
 
         this.client = new AzureQueueStorageBuilder().pipeline(httpPipeline)
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
index 944bba023606..73583db7f684 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -140,7 +140,6 @@ public QueueClient buildClient() {
      */
     public QueueAsyncClient buildAsyncClient() {
         Objects.requireNonNull(endpoint);
-        Objects.requireNonNull(queueName);
 
         if (sasTokenCredential == null && sharedKeyCredential == null && bearerTokenCredential == null) {
             LOGGER.logExceptionAsError(new IllegalArgumentException("Credentials are required for authorization"));
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
index bf79a8453997..d38e8c043629 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
@@ -67,6 +67,9 @@ public AzureQueueStorageBuilder pipeline(HttpPipeline pipeline) {
      * @return an instance of AzureQueueStorageImpl.
      */
     public AzureQueueStorageImpl build() {
+        if (version == null) {
+            this.version = "2018-03-28";
+        }
         if (pipeline == null) {
             this.pipeline = RestProxy.createDefaultPipeline();
         }
@@ -76,8 +79,6 @@ public AzureQueueStorageImpl build() {
         }
         if (this.version != null) {
             client.setVersion(this.version);
-        } else {
-            client.setVersion("2018-03-28");
         }
         return client;
     }
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java
index 1ee2de77a19a..29b4b3a947e7 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java
@@ -29,9 +29,11 @@ public String getUrl() {
      * Sets The URL of the service account, queue or message that is the targe of the desired operation.
      *
      * @param url the url value.
+     * @return the service client itself.
      */
-    void setUrl(String url) {
+    AzureQueueStorageImpl setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     /**
@@ -52,9 +54,11 @@ public String getVersion() {
      * Sets Specifies the version of the operation to use for this request.
      *
      * @param version the version value.
+     * @return the service client itself.
      */
-    void setVersion(String version) {
+    AzureQueueStorageImpl setVersion(String version) {
         this.version = version;
+        return this;
     }
 
     /**
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java
index dfa27d5fed94..a7366b0a8b6b 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java
@@ -27,6 +27,11 @@ public final class StorageErrorCode extends ExpandableStringEnum<StorageErrorCod
      */
     public static final StorageErrorCode ACCOUNT_IS_DISABLED = fromString("AccountIsDisabled");
 
+    /**
+     * Static value AuthenticationError for StorageErrorCode.
+     */
+    public static final StorageErrorCode AUTHENTICATION_ERROR = fromString("AuthenticationError");
+
     /**
      * Static value AuthenticationFailed for StorageErrorCode.
      */
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
deleted file mode 100644
index e2b4b9529d00..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
+++ /dev/null
@@ -1,693 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.AccessPolicy;
-import com.azure.storage.queue.models.DequeuedMessage;
-import com.azure.storage.queue.models.SignedIdentifier;
-import com.azure.storage.queue.models.StorageErrorException;
-import reactor.test.StepVerifier;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-public class QueueAsyncClientTests extends QueueClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueAsyncClientTests.class);
-
-    private QueueAsyncClient client;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildAsyncClient(), true, logger);
-        } else {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildAsyncClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        try {
-            client.clearMessages().block();
-            client.delete().block();
-        } catch (StorageErrorException ex) {
-            // Queue already delete, that's what we wanted anyways.
-        }
-    }
-
-    @Override
-    public void createWithSharedKey() {
-
-    }
-
-    @Override
-    public void createWithSASToken() {
-        // Need to find a way to get SAS tokens from the storage account
-    }
-
-    @Override
-    public void createWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void createTwiceSameMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-    }
-
-    @Override
-    public void createTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.create(metadata))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 409));
-    }
-
-    @Override
-    public void deleteExisting() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage("This queue will be deleted"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.delete())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        helper.sleepInRecordMode(Duration.ofSeconds(30));
-
-        StepVerifier.create(client.enqueueMessage("This should fail"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void deleteNonExistent() {
-        StepVerifier.create(client.delete())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void getProperties() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void getPropertiesQueueDoesNotExist() {
-        StepVerifier.create(client.getProperties())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void setMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setMetadata(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void setMetadataQueueDoesNotExist() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.setMetadata(metadata))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void setInvalidMetadata() {
-        Map<String, String> badMetadata = Collections.singletonMap("", "bad metadata");
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setMetadata(badMetadata))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void deleteMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.setMetadata(null))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(Collections.EMPTY_MAP, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void getAccessPolicy() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getAccessPolicy())
-            .expectNextCount(0)
-            .verifyComplete();
-    }
-
-    @Override
-    public void getAccessPolicyQueueDoesNotExist() {
-        StepVerifier.create(client.getAccessPolicy())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void setAccessPolicy() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("raup")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("testpermission")
-            .accessPolicy(accessPolicy);
-
-        StepVerifier.create(client.setAccessPolicy(Collections.singletonList(permission)))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getAccessPolicy())
-            .assertNext(response -> helper.assertPermissionsAreEqual(permission, response))
-            .verifyComplete();
-    }
-
-    @Override
-    public void setAccessPolicyQueueDoesNotExist() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.now())
-            .expiry(OffsetDateTime.now());
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("test-permission")
-            .accessPolicy(accessPolicy);
-
-        StepVerifier.create(client.setAccessPolicy(Collections.singletonList(permission)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void setInvalidAccessPolicy() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
-            .accessPolicy(accessPolicy);
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setAccessPolicy(Collections.singletonList(permission)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void setTooManyAccessPolicies() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        List<SignedIdentifier> permissions = new ArrayList<>();
-        for (int i = 0; i < 6; i++) {
-            permissions.add(new SignedIdentifier()
-                .id("policy" + i)
-                .accessPolicy(accessPolicy));
-        }
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setAccessPolicy(permissions))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void enqueueMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages())
-            .assertNext(peekedMessage -> assertEquals(messageText, peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void enqueueEmptyMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages())
-            .assertNext(peekedMessage -> assertNull(peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void enqueueShortTimeToLiveMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText, Duration.ofSeconds(0), Duration.ofSeconds(2)))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages().delaySubscription(Duration.ofSeconds(5)))
-            .expectNextCount(0)
-            .verifyComplete();
-    }
-
-    @Override
-    public void enqueueQueueDoesNotExist() {
-        StepVerifier.create(client.enqueueMessage("this should fail"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void dequeueMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.dequeueMessages())
-            .assertNext(dequeuedMessage -> assertEquals(messageText, dequeuedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void dequeueMultipleMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage(messageText2))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.dequeueMessages(2))
-            .assertNext(dequeuedMessage -> assertEquals(messageText, dequeuedMessage.messageText()))
-            .assertNext(dequeuedMessage -> assertEquals(messageText2, dequeuedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void dequeueTooManyMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.dequeueMessages(64))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void dequeueQueueDoesNotExist() {
-        StepVerifier.create(client.dequeueMessages())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void peekMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages())
-            .assertNext(peekedMessage -> assertEquals(messageText, peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void peekMultipleMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage(messageText2))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages(2))
-            .assertNext(peekedMessage -> assertEquals(messageText, peekedMessage.messageText()))
-            .assertNext(peekedMessage -> assertEquals(messageText2, peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void peekTooManyMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages(64))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void peekQueueDoesNotExist() {
-        StepVerifier.create(client.peekMessages())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void clearMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage("test message"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-        StepVerifier.create(client.enqueueMessage("test message"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-        StepVerifier.create(client.enqueueMessage("test message"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(3, response.value().approximateMessagesCount());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.clearMessages())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void clearMessagesQueueDoesNotExist() {
-        StepVerifier.create(client.clearMessages())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void deleteMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-        StepVerifier.create(client.deleteMessage(dequeuedMessage.messageId(), dequeuedMessage.popReceipt()))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void deleteMessageInvalidMessageId() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = new DequeuedMessage();
-        StepVerifier.create(client.dequeueMessages())
-            .assertNext(response -> {
-                assertEquals(messageText, response.messageText());
-                dequeuedMessage.popReceipt(response.popReceipt()).messageId(response.messageId());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.deleteMessage(dequeuedMessage.messageId() + "random", dequeuedMessage.popReceipt()))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void deleteMessageInvalidPopReceipt() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = new DequeuedMessage();
-        StepVerifier.create(client.dequeueMessages())
-            .assertNext(response -> {
-                assertEquals(messageText, response.messageText());
-                dequeuedMessage.popReceipt(response.popReceipt()).messageId(response.messageId());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.deleteMessage(dequeuedMessage.messageId(), dequeuedMessage.popReceipt() + "random"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void deleteMessageQueueDoesNotExist() {
-        StepVerifier.create(client.deleteMessage("invalid", "call"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void updateMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-
-        String updatedMessageText = "updated test message";
-        StepVerifier.create(client.updateMessage(updatedMessageText, dequeuedMessage.messageId(), dequeuedMessage.popReceipt(), Duration.ofSeconds(1)))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages().delaySubscription(Duration.ofSeconds(2)))
-            .assertNext(response -> assertEquals(updatedMessageText, response.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void updateMessageInvalidMessageId() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-
-        String updatedMessageText = "updated test message";
-        StepVerifier.create(client.updateMessage(updatedMessageText, dequeuedMessage.messageId() + "random", dequeuedMessage.popReceipt(), Duration.ofSeconds(1)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void updateMessageInvalidPopReceipt() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-
-        String updatedMessageText = "updated test message";
-        StepVerifier.create(client.updateMessage(updatedMessageText, dequeuedMessage.messageId(), dequeuedMessage.popReceipt() + "random", Duration.ofSeconds(1)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void updateMessageQueueDoesNotExist() {
-        StepVerifier.create(client.updateMessage("queue", "doesn't", "exist", Duration.ofSeconds(5)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
deleted file mode 100644
index 4e3f782d7ec6..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
+++ /dev/null
@@ -1,653 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.http.rest.Response;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.AccessPolicy;
-import com.azure.storage.queue.models.DequeuedMessage;
-import com.azure.storage.queue.models.PeekedMessage;
-import com.azure.storage.queue.models.QueueProperties;
-import com.azure.storage.queue.models.SignedIdentifier;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.UpdatedMessage;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-public class QueueClientTests extends QueueClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueClientTests.class);
-
-    private QueueClient client;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildClient(), true, logger);
-        } else {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        try {
-            client.clearMessages();
-            client.delete();
-        } catch (StorageErrorException ex) {
-            // Queue already delete, that's what we wanted anyways.
-        }
-    }
-
-    @Override
-    public void createWithSharedKey() {
-
-    }
-
-    @Override
-    public void createWithSASToken() {
-        // Need to find a way to get SAS tokens from the storage account
-    }
-
-    @Override
-    public void createWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-
-        QueueProperties properties = client.getProperties().value();
-        assertEquals(metadata, properties.metadata());
-    }
-
-    @Override
-    public void createTwiceSameMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-        helper.assertResponseStatusCode(client.create(metadata), 204);
-    }
-
-    @Override
-    public void createTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.create(metadata);
-            fail("Creating a queue twice with different metadata values should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 409);
-        }
-    }
-
-    @Override
-    public void deleteExisting() {
-        helper.assertResponseStatusCode(client.create(), 201);
-        helper.assertResponseStatusCode(client.enqueueMessage("This queue will be deleted"), 201);
-        helper.assertResponseStatusCode(client.delete(), 204);
-
-        helper.sleepInRecordMode(Duration.ofSeconds(30));
-
-        try {
-            client.enqueueMessage("This should fail");
-            fail("Attempting to work with a queue that has been deleted should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteNonExistent() {
-        try {
-            client.delete();
-            fail("Attempting to delete a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void getProperties() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(metadata, response.value().metadata());
-    }
-
-    @Override
-    public void getPropertiesQueueDoesNotExist() {
-        try {
-            client.getProperties();
-            fail("Attempting to get properties of a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void setMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        helper.assertResponseStatusCode(client.setMetadata(metadata), 204);
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(metadata, response.value().metadata());
-    }
-
-    @Override
-    public void setMetadataQueueDoesNotExist() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        try {
-            client.setMetadata(metadata);
-            fail("Attempting to set metadata on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void setInvalidMetadata() {
-        Map<String, String> badMetadata = Collections.singletonMap("", "bad metadata");
-
-        helper.assertResponseStatusCode(client.create(), 201);
-        try {
-            client.setMetadata(badMetadata);
-            fail("Attempting to set invalid metadata on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void deleteMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(metadata, response.value().metadata());
-
-        helper.assertResponseStatusCode(client.setMetadata(null), 204);
-
-        response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(Collections.EMPTY_MAP, response.value().metadata());
-    }
-
-    @Override
-    public void getAccessPolicy() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        Iterable<SignedIdentifier> accessPolicies = client.getAccessPolicy();
-        assertFalse(accessPolicies.iterator().hasNext());
-    }
-
-    @Override
-    public void getAccessPolicyQueueDoesNotExist() {
-        try {
-            client.getAccessPolicy().iterator().hasNext();
-            fail("Attempting to get access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void setAccessPolicy() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("raup")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("testpermission")
-            .accessPolicy(accessPolicy);
-
-        helper.assertResponseStatusCode(client.setAccessPolicy(Collections.singletonList(permission)), 204);
-
-        Iterator<SignedIdentifier> accessPolicies = client.getAccessPolicy().iterator();
-        helper.assertPermissionsAreEqual(permission, accessPolicies.next());
-        assertFalse(accessPolicies.hasNext());
-    }
-
-    @Override
-    public void setAccessPolicyQueueDoesNotExist() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.now())
-            .expiry(OffsetDateTime.now());
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("test-permission")
-            .accessPolicy(accessPolicy);
-
-        try {
-            client.setAccessPolicy(Collections.singletonList(permission));
-            fail("Attempting to set access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void setInvalidAccessPolicy() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
-            .accessPolicy(accessPolicy);
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.setAccessPolicy(Collections.singletonList(permission));
-            fail("Attempting to set invalid access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void setTooManyAccessPolicies() {
-        List<SignedIdentifier> permissions = new ArrayList<>();
-
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        for (int i = 0; i < 6; i++) {
-            permissions.add(new SignedIdentifier()
-                .id("policy" + i)
-                .accessPolicy(accessPolicy));
-        }
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.setAccessPolicy(permissions);
-            fail("Attempting to set more than five access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void enqueueMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void enqueueEmptyMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertNull(response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void enqueueShortTimeToLiveMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText, Duration.ofSeconds(0), Duration.ofSeconds(2)), 201);
-
-        helper.sleepInRecordMode(Duration.ofSeconds(5));
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void enqueueQueueDoesNotExist() {
-        try {
-            client.enqueueMessage("This should fail");
-            fail("Attempting to enqueue a message on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void dequeueMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void dequeueMultipleMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText2), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages(2).iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertEquals(messageText2, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void dequeueTooManyMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.dequeueMessages(64).iterator().hasNext();
-            fail("Attempting to get more than 32 messages from a queue should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void dequeueQueueDoesNotExist() {
-        try {
-            client.dequeueMessages().iterator().hasNext();
-            fail("Attempting to get messages from a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void peekMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void peekMultipleMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText2), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages(2).iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertEquals(messageText2, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void peekTooManyMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.peekMessages(64).iterator().hasNext();
-            fail("Attempting to peek more than 32 messages from a queue should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void peekQueueDoesNotExist() {
-        try {
-            client.peekMessages().iterator().hasNext();
-            fail("Attempting to peek messages from a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void clearMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        for (int i = 0; i < 3; i++) {
-            helper.assertResponseStatusCode(client.enqueueMessage("test message"), 201);
-        }
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(3, response.value().approximateMessagesCount());
-
-        helper.assertResponseStatusCode(client.clearMessages(), 204);
-
-        response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-    }
-
-    @Override
-    public void clearMessagesQueueDoesNotExist() {
-        try {
-            client.clearMessages();
-            fail("Attempting to clear messages of a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertFalse(response.hasNext());
-        assertEquals(messageText, message.messageText());
-
-        helper.assertResponseStatusCode(client.deleteMessage(message.messageId(), message.popReceipt()), 204);
-
-        Response<QueueProperties> propertiesResponse = client.getProperties();
-        helper.assertResponseStatusCode(propertiesResponse, 200);
-        assertEquals(0, propertiesResponse.value().approximateMessagesCount());
-    }
-
-    @Override
-    public void deleteMessageInvalidMessageId() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertFalse(response.hasNext());
-        assertEquals(messageText, message.messageText());
-
-        try {
-            client.deleteMessage(message.messageId() + "random", message.popReceipt());
-            fail("Attempting to delete a message with an invalid ID should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteMessageInvalidPopReceipt() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertFalse(response.hasNext());
-        assertEquals(messageText, message.messageText());
-
-        try {
-            client.deleteMessage(message.messageId(), message.popReceipt() + "random");
-            fail("Attempting to delete a message with an invalid popReceipt should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void deleteMessageQueueDoesNotExist() {
-        try {
-            client.deleteMessage("invalid", "call");
-            fail("Attempting to delete a message from a queue that doesn't exist should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void updateMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertEquals(messageText, message.messageText());
-        assertFalse(response.hasNext());
-
-        String updatedMessageText = "updated test message";
-        Response<UpdatedMessage> updatedMessageResponse = client.updateMessage(updatedMessageText, message.messageId(), message.popReceipt(), Duration.ofSeconds(1));
-        helper.assertResponseStatusCode(updatedMessageResponse, 204);
-
-        helper.sleepInRecordMode(Duration.ofSeconds(2));
-
-        Iterator<PeekedMessage> peekedMessageIterator = client.peekMessages().iterator();
-        PeekedMessage peekedMessage = peekedMessageIterator.next();
-        assertEquals(updatedMessageText, peekedMessage.messageText());
-        assertFalse(peekedMessageIterator.hasNext());
-    }
-
-    @Override
-    public void updateMessageInvalidMessageId() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertEquals(messageText, message.messageText());
-        assertFalse(response.hasNext());
-
-        String updatedMessageText = "updated test message";
-        try {
-            client.updateMessage(updatedMessageText, message.messageId() + "random", message.popReceipt(), Duration.ofSeconds(1));
-            fail("Attempting to update a message with an invalid ID should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void updateMessageInvalidPopReceipt() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertEquals(messageText, message.messageText());
-        assertFalse(response.hasNext());
-
-        String updatedMessageText = "updated test message";
-        try {
-            client.updateMessage(updatedMessageText, message.messageId(), message.popReceipt() + "random", Duration.ofSeconds(1));
-            fail("Attempting to update a message with an invalid popReceipt should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void updateMessageQueueDoesNotExist() {
-        try {
-            client.updateMessage("queue", "doesn't", "exist", Duration.ofSeconds(5));
-            fail("Attempting to update a message on a queue that doesn't exist should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java
deleted file mode 100644
index b83d9a1459bb..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.test.TestBase;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-public abstract class QueueClientTestsBase extends TestBase {
-    String queueName;
-    TestHelpers helper;
-
-    @Rule
-    public TestName testName = new TestName();
-
-    @Override
-    public String testName() {
-        return testName.getMethodName();
-    }
-
-    String getQueueName() {
-        return testResourceNamer.randomName("queue", 16).toLowerCase();
-    }
-
-    @Test
-    public abstract void createWithSharedKey();
-
-    @Test
-    public abstract void createWithSASToken();
-
-    @Test
-    public abstract void createWithMetadata();
-
-    @Test
-    public abstract void createTwiceSameMetadata();
-
-    @Test
-    public abstract void createTwiceDifferentMetadata();
-
-    @Test
-    public abstract void deleteExisting();
-
-    @Test
-    public abstract void deleteNonExistent();
-
-    @Test
-    public abstract void getProperties();
-
-    @Test
-    public abstract void getPropertiesQueueDoesNotExist();
-
-    @Test
-    public abstract void setMetadata();
-
-    @Test
-    public abstract void setMetadataQueueDoesNotExist();
-
-    @Test
-    public abstract void setInvalidMetadata();
-
-    @Test
-    public abstract void deleteMetadata();
-
-    @Test
-    public abstract void getAccessPolicy();
-
-    @Test
-    public abstract void getAccessPolicyQueueDoesNotExist();
-
-    @Test
-    public abstract void setAccessPolicy();
-
-    @Test
-    public abstract void setAccessPolicyQueueDoesNotExist();
-
-    @Test
-    public abstract void setInvalidAccessPolicy();
-
-    @Test
-    public abstract void setTooManyAccessPolicies();
-
-    @Test
-    public abstract void enqueueMessage();
-
-    @Test
-    public abstract void enqueueEmptyMessage();
-
-    @Test
-    public abstract void enqueueShortTimeToLiveMessage();
-
-    @Test
-    public abstract void enqueueQueueDoesNotExist();
-
-    @Test
-    public abstract void dequeueMessage();
-
-    @Test
-    public abstract void dequeueMultipleMessages();
-
-    @Test
-    public abstract void dequeueTooManyMessages();
-
-    @Test
-    public abstract void dequeueQueueDoesNotExist();
-
-    @Test
-    public abstract void peekMessage();
-
-    @Test
-    public abstract void peekMultipleMessages();
-
-    @Test
-    public abstract void peekTooManyMessages();
-
-    @Test
-    public abstract void peekQueueDoesNotExist();
-
-    @Test
-    public abstract void clearMessages();
-
-    @Test
-    public abstract void clearMessagesQueueDoesNotExist();
-
-    @Test
-    public abstract void deleteMessage();
-
-    @Test
-    public abstract void deleteMessageInvalidMessageId();
-
-    @Test
-    public abstract void deleteMessageInvalidPopReceipt();
-
-    @Test
-    public abstract void deleteMessageQueueDoesNotExist();
-
-    @Test
-    public abstract void updateMessage();
-
-    @Test
-    public abstract void updateMessageInvalidMessageId();
-
-    @Test
-    public abstract void updateMessageInvalidPopReceipt();
-
-    @Test
-    public abstract void updateMessageQueueDoesNotExist();
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java
deleted file mode 100644
index 1be35f6a8910..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.Logging;
-import com.azure.storage.queue.models.Metrics;
-import com.azure.storage.queue.models.QueueItem;
-import com.azure.storage.queue.models.QueuesSegmentOptions;
-import com.azure.storage.queue.models.RetentionPolicy;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.StorageServiceProperties;
-import reactor.test.StepVerifier;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class QueueServiceAsyncClientTests extends QueueServiceClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueServiceAsyncClientTests.class);
-
-    private QueueServiceAsyncClient serviceClient;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildAsyncClient(), true, logger);
-        } else {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildAsyncClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        serviceClient.listQueues(new QueuesSegmentOptions().prefix(queueName))
-            .collectList()
-            .block()
-            .forEach(queue -> {
-                QueueAsyncClient client = serviceClient.getQueueAsyncClient(queue.name());
-                try {
-                    client.clearMessages().then(client.delete()).block();
-                } catch (StorageErrorException ex) {
-                    // Queue already delete, that's what we wanted anyways.
-                }
-            });
-    }
-
-    @Override
-    public void getQueueDoesNotCreateAQueue() {
-        StepVerifier.create(serviceClient.getQueueAsyncClient(queueName).enqueueMessage("Expecting an exception"));
-    }
-
-    @Override
-    public void createQueue() {
-        StepVerifier.create(serviceClient.createQueue(queueName).block().value().enqueueMessage("Testing service client creating a queue"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-    }
-
-    @Override
-    public void createQueueWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-        QueueAsyncClient client = serviceClient.createQueue(queueName, metadata).block().value();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void createQueueTwiceSameMetadata() {
-        final String messageText = "Testing service client creating the same queue twice does not modify the queue";
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(serviceClient.createQueue(queueName, metadata).block().value().enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.createQueue(queueName, metadata).block().value().peekMessages())
-            .assertNext(response -> assertEquals(messageText, response.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void createQueueTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        try {
-            serviceClient.createQueue(queueName);
-            serviceClient.createQueue(queueName, metadata);
-        } catch (Exception exception) {
-        }
-    }
-
-    @Override
-    public void deleteExistingQueue() {
-        QueueAsyncClient client = serviceClient.createQueue(queueName).block().value();
-        serviceClient.deleteQueue(queueName).block();
-
-        StepVerifier.create(client.enqueueMessage("Expecting an exception"));
-    }
-
-    @Override
-    public void deleteNonExistentQueue() {
-        try {
-            serviceClient.deleteQueue(queueName);
-        } catch (Exception exception) {
-        }
-    }
-
-    @Override
-    public void listQueues() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions()))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .verifyComplete();
-    }
-
-    @Override
-    public void listQueuesIncludeMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            if (i % 2 == 0) {
-                queue.metadata(metadata);
-            }
-
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions().includeMetadata(true)))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .verifyComplete();
-    }
-
-    @Override
-    public void listQueuesWithPrefix() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem();
-            if (i % 2 == 0) {
-                queue.name(queueName + "prefix" + i);
-                testQueues.add(queue);
-            } else {
-                queue.name(queueName + i);
-            }
-
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions().prefix(queueName + "prefix")))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .verifyComplete();
-    }
-
-    @Override
-    public void listQueuesWithLimit() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions().maxResults(2)))
-            .assertNext(queueItem -> helper.assertQueuesAreEqual(queueItem, testQueues.pop()))
-            .assertNext(queueItem -> helper.assertQueuesAreEqual(queueItem, testQueues.pop()))
-            .assertNext(queueItem -> helper.assertQueuesAreEqual(queueItem, testQueues.pop()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void setProperties() {
-        StorageServiceProperties originalProperties = serviceClient.getProperties().block().value();
-
-        RetentionPolicy retentionPolicy = new RetentionPolicy().enabled(true)
-            .days(3);
-
-        Logging logging = new Logging().version("1.0")
-            .delete(true)
-            .write(true)
-            .retentionPolicy(retentionPolicy);
-
-        Metrics metrics = new Metrics().enabled(true)
-            .includeAPIs(false)
-            .retentionPolicy(retentionPolicy)
-            .version("1.0");
-
-        StorageServiceProperties updatedProperties = new StorageServiceProperties().logging(logging)
-            .hourMetrics(metrics)
-            .minuteMetrics(metrics)
-            .cors(new ArrayList<>());
-
-        StepVerifier.create(serviceClient.setProperties(updatedProperties))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 202))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.getProperties())
-            .assertNext(response -> helper.assertQueueServicePropertiesAreEqual(updatedProperties, response.value()))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.setProperties(originalProperties))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 202))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.getProperties())
-            .assertNext(response -> helper.assertQueueServicePropertiesAreEqual(originalProperties, response.value()))
-            .verifyComplete();
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java
deleted file mode 100644
index 39e1b9d2beb4..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.http.rest.Response;
-import com.azure.core.http.rest.VoidResponse;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.EnqueuedMessage;
-import com.azure.storage.queue.models.Logging;
-import com.azure.storage.queue.models.Metrics;
-import com.azure.storage.queue.models.PeekedMessage;
-import com.azure.storage.queue.models.QueueItem;
-import com.azure.storage.queue.models.QueueProperties;
-import com.azure.storage.queue.models.QueuesSegmentOptions;
-import com.azure.storage.queue.models.RetentionPolicy;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.StorageServiceProperties;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-public class QueueServiceClientTests extends QueueServiceClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueServiceClientTests.class);
-
-    private QueueServiceClient serviceClient;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildClient(), true, logger);
-        } else {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        serviceClient.listQueues(new QueuesSegmentOptions().prefix(queueName))
-            .forEach(queueToDelete -> {
-                try {
-                    QueueClient client = serviceClient.getQueueClient(queueToDelete.name());
-                    client.clearMessages();
-                    client.delete();
-                } catch (StorageErrorException ex) {
-                    // Queue already delete, that's what we wanted anyways.
-                }
-            });
-    }
-
-    @Override
-    public void getQueueDoesNotCreateAQueue() {
-        try {
-            serviceClient.getQueueClient(queueName).enqueueMessage("Expecting an exception");
-            fail("getQueueClient doesn't create a queue in Azure Storage.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void createQueue() {
-        QueueClient client = serviceClient.createQueue(queueName).value();
-        Response<EnqueuedMessage> response = client.enqueueMessage("Testing service client creating a queue");
-        helper.assertResponseStatusCode(response, 201);
-    }
-
-    @Override
-    public void createQueueWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-        QueueClient client = serviceClient.createQueue(queueName, metadata).value();
-
-        Response<QueueProperties> propertiesResponse = client.getProperties();
-        helper.assertResponseStatusCode(propertiesResponse, 200);
-        assertEquals(metadata, propertiesResponse.value().metadata());
-    }
-
-    @Override
-    public void createQueueTwiceSameMetadata() {
-        final String messageText = "Testing service client creating the same queue twice does not modify the queue";
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        EnqueuedMessage enqueuedMessage = serviceClient.createQueue(queueName, metadata).value().enqueueMessage(messageText).value();
-        assertNotNull(enqueuedMessage);
-
-        PeekedMessage peekedMessage = serviceClient.createQueue(queueName, metadata).value().peekMessages().iterator().next();
-        assertEquals(messageText, peekedMessage.messageText());
-    }
-
-    @Override
-    public void createQueueTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        try {
-            serviceClient.createQueue(queueName);
-            serviceClient.createQueue(queueName, metadata);
-            fail("Creating a queue twice with different metadata should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 409);
-        }
-    }
-
-    @Override
-    public void deleteExistingQueue() {
-        QueueClient client = serviceClient.createQueue(queueName).value();
-        serviceClient.deleteQueue(queueName);
-
-        try {
-            client.enqueueMessage("Expecting an exception");
-            fail("Attempting to enqueue a message on a client that has been delete should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteNonExistentQueue() {
-        try {
-            serviceClient.deleteQueue(queueName);
-            fail("Attempting to delete a queue that doesn't exist should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void listQueues() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions())) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void listQueuesIncludeMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            if (i % 2 == 0) {
-                queue.metadata(metadata);
-            }
-
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions().includeMetadata(true))) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void listQueuesWithPrefix() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem();
-            if (i % 2 == 0) {
-                queue.name(queueName + "prefix" + i);
-                testQueues.add(queue);
-            } else {
-                queue.name(queueName + i);
-            }
-
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions().prefix(queueName + "prefix"))) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void listQueuesWithLimit() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions().maxResults(2))) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void setProperties() {
-        StorageServiceProperties originalProperties = serviceClient.getProperties().value();
-
-        RetentionPolicy retentionPolicy = new RetentionPolicy().enabled(true)
-            .days(3);
-
-        Logging logging = new Logging().version("1.0")
-            .delete(true)
-            .write(true)
-            .retentionPolicy(retentionPolicy);
-
-        Metrics metrics = new Metrics().enabled(true)
-            .includeAPIs(false)
-            .retentionPolicy(retentionPolicy)
-            .version("1.0");
-
-        StorageServiceProperties updatedProperties = new StorageServiceProperties().logging(logging)
-            .hourMetrics(metrics)
-            .minuteMetrics(metrics)
-            .cors(new ArrayList<>());
-
-        VoidResponse setResponse = serviceClient.setProperties(updatedProperties);
-        helper.assertResponseStatusCode(setResponse, 202);
-
-        Response<StorageServiceProperties> getResponse = serviceClient.getProperties();
-        helper.assertQueueServicePropertiesAreEqual(updatedProperties, getResponse.value());
-
-        setResponse = serviceClient.setProperties(originalProperties);
-        helper.assertResponseStatusCode(setResponse, 202);
-
-        getResponse = serviceClient.getProperties();
-        helper.assertQueueServicePropertiesAreEqual(originalProperties, getResponse.value());
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java
deleted file mode 100644
index f090814fbfc9..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.test.TestBase;
-import com.azure.storage.queue.models.QueuesSegmentOptions;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-public abstract class QueueServiceClientTestsBase extends TestBase {
-    String queueName;
-    TestHelpers helper;
-
-    @Rule
-    public TestName testName = new TestName();
-
-    @Override
-    public String testName() {
-        return testName.getMethodName();
-    }
-
-    String getQueueName() {
-        return testResourceNamer.randomName("queue", 16).toLowerCase();
-    }
-
-    @Test
-    public abstract void getQueueDoesNotCreateAQueue();
-
-    @Test
-    public abstract void createQueue();
-
-    @Test
-    public abstract void createQueueWithMetadata();
-
-    @Test
-    public abstract void createQueueTwiceSameMetadata();
-
-    @Test
-    public abstract void createQueueTwiceDifferentMetadata();
-
-    @Test
-    public abstract void deleteExistingQueue();
-
-    @Test
-    public abstract void deleteNonExistentQueue();
-
-    @Test
-    public abstract void listQueues();
-
-    @Test
-    public abstract void listQueuesIncludeMetadata();
-
-    @Test
-    public abstract void listQueuesWithPrefix();
-
-    @Test
-    public abstract void listQueuesWithLimit();
-
-    @Test
-    public abstract void setProperties();
-
-    QueuesSegmentOptions defaultSegmentOptions() {
-        return new QueuesSegmentOptions().prefix(queueName);
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/TestHelpers.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/TestHelpers.java
deleted file mode 100644
index 48639715112f..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/TestHelpers.java
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.rest.Response;
-import com.azure.core.implementation.util.ImplUtils;
-import com.azure.core.util.configuration.ConfigurationManager;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.CorsRule;
-import com.azure.storage.queue.models.Logging;
-import com.azure.storage.queue.models.Metrics;
-import com.azure.storage.queue.models.QueueItem;
-import com.azure.storage.queue.models.RetentionPolicy;
-import com.azure.storage.queue.models.SignedIdentifier;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.StorageServiceProperties;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.function.BiFunction;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * Contains helper methods for unit tests.
- */
-class TestHelpers {
-    private final String azureStorageConnectionString = "AZURE_STORAGE_CONNECTION_STRING";
-    private final String azureStorageQueueEndpoint = "AZURE_STORAGE_QUEUE_ENDPOINT";
-
-    <T> T setupClient(BiFunction<String, String, T> clientBuilder, boolean isPlaybackMode, ClientLogger logger) {
-        String connectionString = "DefaultEndpointsProtocol=https;AccountName=teststorage;AccountKey=atestaccountkey;EndpointSuffix=core.windows.net";
-        String queueEndpoint = "https://teststorage.queue.core.windows.net/";
-
-        if (!isPlaybackMode) {
-            connectionString = ConfigurationManager.getConfiguration().get(azureStorageConnectionString);
-            queueEndpoint = ConfigurationManager.getConfiguration().get(azureStorageQueueEndpoint);
-        }
-
-        if (ImplUtils.isNullOrEmpty(connectionString) && ImplUtils.isNullOrEmpty(queueEndpoint)) {
-            logger.warning("{} and {} must be set to build the testing client", azureStorageConnectionString, azureStorageQueueEndpoint);
-            fail();
-            return null;
-        }
-
-        return clientBuilder.apply(connectionString, queueEndpoint);
-    }
-
-    void assertQueuesAreEqual(QueueItem expected, QueueItem actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.name(), actual.name());
-
-            if (expected.metadata() != null && !ImplUtils.isNullOrEmpty(actual.metadata())) {
-                assertEquals(expected.metadata(), actual.metadata());
-            }
-        }
-    }
-
-    void assertQueueServicePropertiesAreEqual(StorageServiceProperties expected, StorageServiceProperties actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertMetricsAreEqual(expected.hourMetrics(), actual.hourMetrics());
-            assertMetricsAreEqual(expected.minuteMetrics(), actual.minuteMetrics());
-            assertLoggingAreEqual(expected.logging(), actual.logging());
-            assertCorsAreEqual(expected.cors(), actual.cors());
-        }
-    }
-
-    private void assertMetricsAreEqual(Metrics expected, Metrics actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.enabled(), actual.enabled());
-            assertEquals(expected.includeAPIs(), actual.includeAPIs());
-            assertEquals(expected.version(), actual.version());
-            assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy());
-        }
-    }
-
-    private void assertLoggingAreEqual(Logging expected, Logging actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.read(), actual.read());
-            assertEquals(expected.write(), actual.write());
-            assertEquals(expected.delete(), actual.delete());
-            assertEquals(expected.version(), actual.version());
-            assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy());
-        }
-    }
-
-    private void assertRetentionPoliciesAreEqual(RetentionPolicy expected, RetentionPolicy actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.days(), actual.days());
-            assertEquals(expected.enabled(), actual.enabled());
-        }
-    }
-
-    private void assertCorsAreEqual(List<CorsRule> expected, List<CorsRule> actual) {
-        if (expected == null) {
-            assertTrue(ImplUtils.isNullOrEmpty(actual));
-        } else {
-            assertEquals(expected.size(), actual.size());
-            for (int i = 0; i < expected.size(); i++) {
-                assertCorRulesAreEqual(expected.get(i), actual.get(i));
-            }
-        }
-    }
-
-    private void assertCorRulesAreEqual(CorsRule expected, CorsRule actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.allowedHeaders(), actual.allowedHeaders());
-            assertEquals(expected.allowedMethods(), actual.allowedMethods());
-            assertEquals(expected.allowedOrigins(), actual.allowedOrigins());
-            assertEquals(expected.exposedHeaders(), actual.exposedHeaders());
-            assertEquals(expected.maxAgeInSeconds(), actual.maxAgeInSeconds());
-        }
-    }
-
-    void assertPermissionsAreEqual(SignedIdentifier expected, SignedIdentifier actual) {
-        assertEquals(expected.id(), actual.id());
-        assertEquals(expected.accessPolicy().permission(), actual.accessPolicy().permission());
-        assertEquals(expected.accessPolicy().start(), actual.accessPolicy().start());
-        assertEquals(expected.accessPolicy().expiry(), actual.accessPolicy().expiry());
-    }
-
-    void assertResponseStatusCode(Response<?> response, int expectedStatusCode) {
-        assertEquals(expectedStatusCode, response.statusCode());
-    }
-
-    void assertExceptionStatusCode(Throwable throwable, int expectedStatusCode) {
-        assertTrue(throwable instanceof StorageErrorException);
-        StorageErrorException storageErrorException = (StorageErrorException) throwable;
-        assertEquals(expectedStatusCode, storageErrorException.response().statusCode());
-    }
-
-    void sleepInRecordMode(Duration duration) {
-        String azureTestMode = ConfigurationManager.getConfiguration().get("AZURE_TEST_MODE");
-        if ("RECORD".equalsIgnoreCase(azureTestMode)) {
-            sleep(duration);
-        }
-    }
-
-    void sleep(Duration duration) {
-        try {
-            Thread.sleep(duration.toMillis());
-        } catch (InterruptedException ex) {
-            // Ignore the error
-        }
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/APISpec.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/APISpec.groovy
new file mode 100644
index 000000000000..51618c5a2a74
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/APISpec.groovy
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.core.test.InterceptorManager
+import com.azure.core.test.TestMode
+import com.azure.core.test.utils.TestResourceNamer
+import com.azure.core.util.configuration.ConfigurationManager
+import com.azure.core.util.logging.ClientLogger
+import com.azure.storage.queue.QueueClientBuilder
+import com.azure.storage.queue.QueueServiceClient
+import com.azure.storage.queue.QueueServiceClientBuilder
+import com.azure.storage.queue.models.QueuesSegmentOptions
+import spock.lang.Specification
+
+class APISpec extends Specification {
+    // Field common used for all APIs.
+    def logger = new ClientLogger(APISpec.class)
+    def AZURE_TEST_MODE = "AZURE_TEST_MODE"
+    def interceptorManager
+    def testResourceName
+
+    // Clients for API tests
+    def primaryQueueServiceClient
+    def primaryQueueServiceAsyncClient
+
+
+    // Test name for test method name.
+    def methodName
+    def testMode = getTestMode()
+    def connectionString = ConfigurationManager.getConfiguration().get("AZURE_STORAGE_QUEUE_CONNECTION_STRING")
+
+    /**
+     * Setup the QueueServiceClient and QueueClient common used for the API tests.
+     */
+    def setup() {
+        String testName = refactorName(specificationContext.currentIteration.getName())
+        String className = specificationContext.getCurrentSpec().getName()
+        methodName = className + testName
+        logger.info("Test Mode: {}, Name: {}", testMode, methodName)
+        interceptorManager = new InterceptorManager(methodName, testMode)
+        testResourceName = new TestResourceNamer(methodName, testMode,
+            interceptorManager.getRecordedData())
+    }
+
+    /**
+     * Clean up the test queues and messages for the account.
+     */
+    def cleanup() {
+
+        interceptorManager.close()
+        if (getTestMode() == TestMode.RECORD) {
+            QueueServiceClient cleanupQueueServiceClient = new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .buildClient()
+            cleanupQueueServiceClient.listQueues(new QueuesSegmentOptions().prefix(methodName.toLowerCase())).each {
+                queueItem -> cleanupQueueServiceClient.deleteQueue(queueItem.name())
+            }
+        }
+    }
+
+    /**
+     * Test mode is initialized whenever test is executed. Helper method which is used to determine what to do under
+     * certain test mode.
+     * @return The TestMode:
+     * <ul>
+     *     <li>Playback: (default if no test mode setup)</li>
+     * </ul>
+     */
+    def getTestMode() {
+        def azureTestMode = ConfigurationManager.getConfiguration().get(AZURE_TEST_MODE)
+
+        if (azureTestMode != null) {
+            try {
+                return TestMode.valueOf(azureTestMode.toUpperCase(Locale.US))
+            } catch (IllegalArgumentException e) {
+                logger.error("Could not parse '{}' into TestEnum. Using 'Playback' mode.", azureTestMode)
+                return TestMode.PLAYBACK
+            }
+        }
+
+        logger.info("Environment variable '{}' has not been set yet. Using 'Playback' mode.", AZURE_TEST_MODE)
+        return TestMode.PLAYBACK
+    }
+
+    def queueServiceBuilderHelper(final InterceptorManager interceptorManager) {
+        if (testMode == TestMode.RECORD) {
+            return new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .addPolicy(interceptorManager.getRecordPolicy())
+        } else {
+            return new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .httpClient(interceptorManager.getPlaybackClient())
+        }
+    }
+
+    def queueBuilderHelper(final InterceptorManager interceptorManager) {
+        def queueName = testResourceName.randomName("queue", 16)
+        if (testMode == TestMode.RECORD) {
+            return new QueueClientBuilder()
+                .connectionString(connectionString)
+                .queueName(queueName)
+                .addPolicy(interceptorManager.getRecordPolicy())
+        } else {
+            return new QueueClientBuilder()
+                .connectionString(connectionString)
+                .queueName(queueName)
+                .httpClient(interceptorManager.getPlaybackClient())
+        }
+    }
+
+    private def refactorName(String text) {
+        def fullName = text.split(" ").collect { it.capitalize() }.join("")
+        def matcher = (fullName =~ /(.*)(\[)(.*)(\])/)
+
+        if (!matcher.find()) {
+            return fullName
+        }
+        return matcher[0][1] + matcher[0][3]
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAPITests.groovy
new file mode 100644
index 000000000000..46b52436bf4c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAPITests.groovy
@@ -0,0 +1,446 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+
+import com.azure.storage.queue.models.AccessPolicy
+import com.azure.storage.queue.models.SignedIdentifier
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageErrorException
+import reactor.test.StepVerifier
+import spock.lang.Ignore
+import spock.lang.Unroll
+
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
+class QueueAPITests extends APISpec {
+    def queueClient
+
+    static def testMetadata = Collections.singletonMap("metadata", "value")
+    static def createMetadata = Collections.singletonMap("metadata1", "value")
+
+    def setup() {
+        primaryQueueServiceClient = queueServiceBuilderHelper(interceptorManager).buildClient()
+        queueClient = primaryQueueServiceClient.getQueueClient(testResourceName.randomName(methodName, 60))
+    }
+
+    def "Create queue with shared key"() {
+        expect:
+        QueueTestHelper.assertResponseStatusCode(queueClient.create(), 201)
+    }
+
+    // TODO: Will implement the test after introduce the sas token generator
+    @Ignore
+    def "Create queue with sas token"() {
+
+    }
+
+    def "Delete exist queue"() {
+        given:
+        queueClient.create()
+        when:
+        def deleteQueueResponse = queueClient.delete()
+        then:
+        QueueTestHelper.assertResponseStatusCode(deleteQueueResponse, 204)
+
+    }
+
+    def "Delete queue error"() {
+        when:
+        queueClient.delete()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Get properties"() {
+        given:
+        queueClient.create(testMetadata)
+        when:
+        def getPropertiesResponse = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponse, 200)
+        getPropertiesResponse.value().approximateMessagesCount() == 0
+        testMetadata.equals(getPropertiesResponse.value().metadata())
+    }
+
+    def "Get properties error"() {
+        when:
+        queueClient.getProperties()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    @Unroll
+    def "Set and clear metadata"() {
+        given:
+        queueClient.create(matadataInCreate)
+        when:
+        def getPropertiesResponseBefore = queueClient.getProperties()
+        def setMetadataResponse = queueClient.setMetadata(metadataInSet)
+        def getPropertiesResponseAfter = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponseBefore, 200)
+        expectMetadataInCreate.equals(getPropertiesResponseBefore.value().metadata())
+        QueueTestHelper.assertResponseStatusCode(setMetadataResponse, 204)
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponseAfter, 200)
+        expectMetadataInSet.equals(getPropertiesResponseAfter.value().metadata)
+        where:
+        matadataInCreate | metadataInSet | expectMetadataInCreate | expectMetadataInSet
+        null             | testMetadata  | Collections.emptyMap() | testMetadata
+        createMetadata   | testMetadata  | createMetadata         | testMetadata
+        createMetadata   | null          | createMetadata         | Collections.emptyMap()
+        testMetadata     | testMetadata  | testMetadata           | testMetadata
+        null             | null          | Collections.emptyMap() | Collections.emptyMap()
+    }
+
+    def "Set metadata queue error"() {
+        when:
+        queueClient.setMetadata(testMetadata)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    @Unroll
+    def "Set invalid meta"() {
+        given:
+        def invalidMetadata = Collections.singletonMap(invalidKey, "value")
+        queueClient.create()
+        when:
+        queueClient.setMetadata(invalidMetadata)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMessage)
+        where:
+        invalidKey     | statusCode | errMessage
+        "invalidMeta"  | 403        | StorageErrorCode.AUTHENTICATION_ERROR
+        "invalid-meta" | 400        | StorageErrorCode.INVALID_METADATA
+        "12345"        | 400        | StorageErrorCode.INVALID_METADATA
+        ""             | 400        | StorageErrorCode.EMPTY_METADATA_KEY
+    }
+
+    def "Get access policy"() {
+        given:
+        queueClient.create()
+        when:
+        def accessPolicies = queueClient.getAccessPolicy()
+        then:
+        !accessPolicies.iterator().hasNext()
+    }
+
+    def "Get access policy error"() {
+        when:
+        queueClient.getAccessPolicy().iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Set access policy"() {
+        given:
+        queueClient.create()
+        def accessPolicy = new AccessPolicy()
+            .permission("raup")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+        def permission = new SignedIdentifier()
+            .id("testpermission")
+            .accessPolicy(accessPolicy)
+        when:
+        def setAccessPolicyResponse = queueClient.setAccessPolicy(Collections.singletonList(permission))
+        def nextAccessPolicy = queueClient.getAccessPolicy().iterator().next()
+        then:
+        QueueTestHelper.assertResponseStatusCode(setAccessPolicyResponse, 204)
+        QueueTestHelper.assertPermissionsAreEqual(permission, nextAccessPolicy)
+    }
+
+    def "Set invalid access policy"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permission = new SignedIdentifier()
+            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
+            .accessPolicy(accessPolicy)
+        queueClient.create()
+        when:
+        queueClient.setAccessPolicy(Collections.singletonList(permission))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+    }
+
+    def "Set multiple access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 3; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueClient.create()
+        when:
+        def setAccessPolicyResponse = queueClient.setAccessPolicy(permissions)
+        def nextAccessPolicy = queueClient.getAccessPolicy().iterator()
+        then:
+        QueueTestHelper.assertResponseStatusCode(setAccessPolicyResponse, 204)
+        QueueTestHelper.assertPermissionsAreEqual(permissions[0], nextAccessPolicy.next())
+        QueueTestHelper.assertPermissionsAreEqual(permissions[1], nextAccessPolicy.next())
+        QueueTestHelper.assertPermissionsAreEqual(permissions[2], nextAccessPolicy.next())
+        !nextAccessPolicy.hasNext()
+    }
+
+    def "Set too many access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 6; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueClient.create()
+        when:
+        queueClient.setAccessPolicy(permissions)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+    }
+
+    def "Enqueue message"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        when:
+        def enqueueMsgResponse = queueClient.enqueueMessage(expectMsg)
+        def peekMsgIter = queueClient.peekMessages().iterator()
+        then:
+        QueueTestHelper.assertResponseStatusCode(enqueueMsgResponse, 201)
+        expectMsg.equals(peekMsgIter.next().messageText())
+        !peekMsgIter.hasNext()
+    }
+
+    def "Enqueue empty message"() {
+        given:
+        queueClient.create()
+        def expectMsg = ""
+        when:
+        def enqueueMsgResponse = queueClient.enqueueMessage(expectMsg)
+        def peekMsgIter = queueClient.peekMessages().iterator()
+        then:
+        QueueTestHelper.assertResponseStatusCode(enqueueMsgResponse, 201)
+        peekMsgIter.next().messageText() == null
+        !peekMsgIter.hasNext()
+    }
+
+    def "Enqueue time to live"() {
+        given:
+        queueClient.create()
+        when:
+        def enqueueMsgResponse = queueClient.enqueueMessage("test message",
+            Duration.ofSeconds(0), Duration.ofSeconds(2))
+        then:
+        QueueTestHelper.assertResponseStatusCode(enqueueMsgResponse, 201)
+    }
+
+    def "Dequeue message"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        queueClient.enqueueMessage(expectMsg)
+        when:
+        def dequeueMsgResponse = queueClient.dequeueMessages().iterator().next()
+        then:
+        expectMsg.equals(dequeueMsgResponse.messageText())
+    }
+
+    def "Dequeue multiple messages"() {
+        given:
+        queueClient.create()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueClient.enqueueMessage(expectMsg1)
+        queueClient.enqueueMessage(expectMsg2)
+        when:
+        def dequeueMsgIter = queueClient.dequeueMessages(2).iterator()
+        then:
+        expectMsg1.equals(dequeueMsgIter.next().messageText())
+        expectMsg2.equals(dequeueMsgIter.next().messageText())
+    }
+
+    def "Dequeue too many message"() {
+        given:
+        queueClient.create()
+        when:
+        queueClient.dequeueMessages(33).iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+    }
+
+    def "Peek message"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        queueClient.enqueueMessage(expectMsg)
+        when:
+        def peekMsgIter = queueClient.peekMessages().iterator().next()
+        then:
+        expectMsg.equals(peekMsgIter.messageText())
+    }
+
+    def "Peek multiple messages"() {
+        given:
+        queueClient.create()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueClient.enqueueMessage(expectMsg1)
+        queueClient.enqueueMessage(expectMsg2)
+        when:
+        def peekMsgIter = queueClient.peekMessages(2).iterator()
+        then:
+        expectMsg1.equals(peekMsgIter.next().messageText())
+        expectMsg2.equals(peekMsgIter.next().messageText())
+        !peekMsgIter.hasNext()
+    }
+
+    def "Peek too many message"() {
+        given:
+        queueClient.create()
+        when:
+        queueClient.peekMessages(33).iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+    }
+
+    def "Peek messages error"() {
+        when:
+        queueClient.peekMessages().iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Clear messages"() {
+        given:
+        queueClient.create()
+        queueClient.enqueueMessage("test message 1")
+        queueClient.enqueueMessage("test message 2")
+        queueClient.enqueueMessage("test message 3")
+        when:
+        def getPropertiesResponse = queueClient.getProperties()
+        def clearMsgResponse = queueClient.clearMessages()
+        def getPropertiesAfterResponse = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponse, 200)
+        getPropertiesResponse.value().approximateMessagesCount() == 3
+        QueueTestHelper.assertResponseStatusCode(clearMsgResponse, 204)
+        QueueTestHelper.assertResponseStatusCode(getPropertiesAfterResponse, 200)
+        getPropertiesAfterResponse.value().approximateMessagesCount() == 0
+    }
+
+    def "Clear messages error"() {
+        when:
+        StepVerifier.create(queueClient.clearMessages())
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Delete message"() {
+        given:
+        queueClient.create()
+        queueClient.enqueueMessage("test message 1")
+        queueClient.enqueueMessage("test message 2")
+        queueClient.enqueueMessage("test message 3")
+        def dequeueMsg = queueClient.dequeueMessages().iterator().next()
+        when:
+        def getPropertiesResponse = queueClient.getProperties()
+        def deleteMsgResponse = queueClient.deleteMessage(dequeueMsg.messageId(), dequeueMsg.popReceipt())
+        def getPropertiesAfterResponse = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponse, 200)
+        getPropertiesResponse.value().approximateMessagesCount() == 3
+        QueueTestHelper.assertResponseStatusCode(deleteMsgResponse, 204)
+        QueueTestHelper.assertResponseStatusCode(getPropertiesAfterResponse, 200)
+        getPropertiesAfterResponse.value().approximateMessagesCount() == 2
+    }
+
+    @Unroll
+    def "Delete message invalid args"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        queueClient.enqueueMessage(expectMsg)
+        def dequeueMessageIter = queueClient.dequeueMessages().iterator().next()
+        when:
+        def deleteMessageId = messageId ? dequeueMessageIter.messageId() : dequeueMessageIter.messageId() + "Random"
+        def deletePopReceipt = popReceipt ? dequeueMessageIter.popReceipt() : dequeueMessageIter.popReceipt() + "Random"
+        queueClient.deleteMessage(deleteMessageId, deletePopReceipt)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMsg)
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+    def "Update message"() {
+        given:
+        def updateMsg = "Updated test message"
+        queueClient.create()
+        queueClient.enqueueMessage("test message before update")
+
+        def dequeueMsg = queueClient.dequeueMessages().iterator().next()
+        when:
+        def updateMsgResponse = queueClient.updateMessage(updateMsg,
+            dequeueMsg.messageId(), dequeueMsg.popReceipt(), Duration.ofSeconds(1))
+        QueueTestHelper.sleepInRecord(Duration.ofSeconds(2))
+        def peekMsgIter = queueClient.peekMessages().iterator().next()
+        then:
+        QueueTestHelper.assertResponseStatusCode(updateMsgResponse, 204)
+        updateMsg.equals(peekMsgIter.messageText())
+    }
+
+    @Unroll
+    def "Update message invalid args"() {
+        given:
+        queueClient.create()
+        def updateMsg = "Updated test message"
+        queueClient.enqueueMessage("test message before update")
+        def dequeueMessageIter = queueClient.dequeueMessages().iterator().next()
+        when:
+        def updateMessageId = messageId ? dequeueMessageIter.messageId() : dequeueMessageIter.messageId() + "Random"
+        def updatePopReceipt = popReceipt ? dequeueMessageIter.popReceipt() : dequeueMessageIter.popReceipt() + "Random"
+        queueClient.updateMessage(updateMsg, updateMessageId, updatePopReceipt, Duration.ofSeconds(1))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMsg)
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAysncAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAysncAPITests.groovy
new file mode 100644
index 000000000000..653016c3b0a7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAysncAPITests.groovy
@@ -0,0 +1,511 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.storage.queue.models.AccessPolicy
+import com.azure.storage.queue.models.SignedIdentifier
+import com.azure.storage.queue.models.StorageErrorCode
+import reactor.test.StepVerifier
+import spock.lang.Ignore
+import spock.lang.Unroll
+
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
+class QueueAysncAPITests extends APISpec {
+    def queueAsyncClient
+
+    static def testMetadata = Collections.singletonMap("metadata", "value")
+    static def createMetadata = Collections.singletonMap("metadata1", "value")
+
+    def setup() {
+        primaryQueueServiceAsyncClient = queueServiceBuilderHelper(interceptorManager).buildAsyncClient()
+        queueAsyncClient = primaryQueueServiceAsyncClient.getQueueAsyncClient(testResourceName.randomName(methodName, 60))
+    }
+
+    def "Create queue with shared key"() {
+        expect:
+        StepVerifier.create(queueAsyncClient.create()).assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201) }
+            .verifyComplete()
+    }
+
+    // TODO: Will implement the test after introduce the sas token generator
+    @Ignore
+    def "Create queue with sas token"() {
+
+    }
+
+    def "Delete exist queue"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def deleteQueueVerifier = StepVerifier.create(queueAsyncClient.delete())
+        then:
+        deleteQueueVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204) }
+            .verifyComplete()
+    }
+
+    def "Delete queue error"() {
+        when:
+        def deleteQueueVerifier = StepVerifier.create(queueAsyncClient.delete())
+        then:
+        deleteQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Get properties"() {
+        given:
+        queueAsyncClient.create(testMetadata).block()
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 0
+            assert testMetadata.equals(it.value().metadata())
+        }.verifyComplete()
+    }
+
+    def "Get properties error"() {
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    @Unroll
+    def "Set and clear metadata"() {
+        given:
+        queueAsyncClient.create(matadataInCreate).block()
+        when:
+        def getPropertiesVerifierBefore = StepVerifier.create(queueAsyncClient.getProperties())
+        def setMetadataVerifier = StepVerifier.create(queueAsyncClient.setMetadata(metadataInSet))
+        def getPropertiesVerifierAfter = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifierBefore.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert expectMetadataInCreate.equals(it.value().metadata())
+        }.verifyComplete()
+        setMetadataVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204) }
+            .verifyComplete()
+        getPropertiesVerifierAfter.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert expectMetadataInSet.equals(it.value().metadata)
+        }.verifyComplete()
+        where:
+        matadataInCreate | metadataInSet | expectMetadataInCreate | expectMetadataInSet
+        null             | testMetadata  | Collections.emptyMap() | testMetadata
+        createMetadata   | testMetadata  | createMetadata         | testMetadata
+        createMetadata   | null          | createMetadata         | Collections.emptyMap()
+        testMetadata     | testMetadata  | testMetadata           | testMetadata
+        null             | null          | Collections.emptyMap() | Collections.emptyMap()
+    }
+
+    def "Set metadata queue error"() {
+        when:
+        def setMetadataVerifier = StepVerifier.create(queueAsyncClient.setMetadata(testMetadata))
+        then:
+        setMetadataVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    @Unroll
+    def "Set invalid meta"() {
+        given:
+        def invalidMetadata = Collections.singletonMap(invalidKey, "value")
+        queueAsyncClient.create().block()
+        when:
+        def setMetadataVerifier = StepVerifier.create(queueAsyncClient.setMetadata(invalidMetadata))
+        then:
+        setMetadataVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMessage)
+        }
+        where:
+        invalidKey     | statusCode | errMessage
+        "invalidMeta"  | 403        | StorageErrorCode.AUTHENTICATION_ERROR
+        "invalid-meta" | 400        | StorageErrorCode.INVALID_METADATA
+        "12345"        | 400        | StorageErrorCode.INVALID_METADATA
+        ""             | 400        | StorageErrorCode.EMPTY_METADATA_KEY
+    }
+
+    def "Get access policy"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        getAccessPolicyVerifier.verifyComplete()
+    }
+
+    def "Get access policy does error"() {
+        when:
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        getAccessPolicyVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Set access policy"() {
+        given:
+        queueAsyncClient.create().block()
+        def accessPolicy = new AccessPolicy()
+            .permission("raup")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+        def permission = new SignedIdentifier()
+            .id("testpermission")
+            .accessPolicy(accessPolicy)
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(Collections.singletonList(permission)))
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        setAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permission, it)
+        }.verifyComplete()
+    }
+
+    def "Set invalid access policy"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permission = new SignedIdentifier()
+            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
+            .accessPolicy(accessPolicy)
+        queueAsyncClient.create().block()
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(Collections.singletonList(permission)))
+        then:
+        setAccessPolicyVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+        }
+    }
+
+    def "Set multiple access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 3; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueAsyncClient.create().block()
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(permissions))
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        setAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permissions[0], it)
+        }.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permissions[1], it)
+        }.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permissions[2], it)
+        }.verifyComplete()
+    }
+
+    def "Set too many access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 6; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueAsyncClient.create().block()
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(permissions))
+        then:
+        setAccessPolicyVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+        }
+    }
+
+    def "Enqueue message"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        when:
+        def enqueueMsgVerifier = StepVerifier.create(queueAsyncClient.enqueueMessage(expectMsg))
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        enqueueMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        peekMsgVerifier.assertNext {
+            assert expectMsg.equals(it.messageText())
+            assert !it.hasNext()
+        }
+    }
+
+    def "Enqueue empty message"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def enqueueMsgVerifier = StepVerifier.create(queueAsyncClient.enqueueMessage(""))
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        enqueueMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        peekMsgVerifier.assertNext {
+            assert it.messageText() == null
+            assert !it.hasNext()
+        }
+    }
+
+    def "Enqueue time to live"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def enqueueMsgVerifier = StepVerifier.create(queueAsyncClient.enqueueMessage("test message",
+            Duration.ofSeconds(0), Duration.ofSeconds(2)))
+        then:
+        enqueueMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+    }
+
+    def "Dequeue message"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        queueAsyncClient.enqueueMessage(expectMsg).block()
+        when:
+        def dequeueMsgVerifier = StepVerifier.create(queueAsyncClient.dequeueMessages())
+        then:
+        dequeueMsgVerifier.assertNext {
+            assert expectMsg.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Dequeue multiple messages"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueAsyncClient.enqueueMessage(expectMsg1).block()
+        queueAsyncClient.enqueueMessage(expectMsg2).block()
+        when:
+        def dequeueMsgVerifier = StepVerifier.create(queueAsyncClient.dequeueMessages(2))
+        then:
+        dequeueMsgVerifier.assertNext {
+            assert expectMsg1.equals(it.messageText())
+        }.assertNext {
+            assert expectMsg2.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Dequeue too many message"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def dequeueMsgVerifier = StepVerifier.create(queueAsyncClient.dequeueMessages(33))
+        then:
+        dequeueMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+        }
+    }
+
+    def "Peek message"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        queueAsyncClient.enqueueMessage(expectMsg).block()
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        peekMsgVerifier.assertNext {
+            assert expectMsg.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Peek multiple messages"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueAsyncClient.enqueueMessage(expectMsg1).block()
+        queueAsyncClient.enqueueMessage(expectMsg2).block()
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages(2))
+        then:
+        peekMsgVerifier.assertNext {
+            assert expectMsg1.equals(it.messageText())
+        }.assertNext {
+            assert expectMsg2.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Peek too many message"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages(33))
+        then:
+        peekMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+        }
+    }
+
+    def "Peek messages error"() {
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        peekMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Clear messages"() {
+        given:
+        queueAsyncClient.create().block()
+        queueAsyncClient.enqueueMessage("test message 1").block()
+        queueAsyncClient.enqueueMessage("test message 2").block()
+        queueAsyncClient.enqueueMessage("test message 3").block()
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        def clearMsgVerifier = StepVerifier.create(queueAsyncClient.clearMessages())
+        def getPropertiesAfterVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 3
+        }.verifyComplete()
+        clearMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getPropertiesAfterVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 0
+        }.verifyComplete()
+    }
+
+    def "Clear messages error"() {
+        when:
+        def clearMsgVerifier = StepVerifier.create(queueAsyncClient.clearMessages())
+        then:
+        clearMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Delete message"() {
+        given:
+        queueAsyncClient.create().block()
+        queueAsyncClient.enqueueMessage("test message 1").block()
+        queueAsyncClient.enqueueMessage("test message 2").block()
+        queueAsyncClient.enqueueMessage("test message 3").block()
+        def dequeueMsg = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        def deleteMsgVerifier = StepVerifier.create(queueAsyncClient.deleteMessage(dequeueMsg.messageId(), dequeueMsg.popReceipt()))
+        def getPropertiesAfterVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 3
+
+        }.verifyComplete()
+        deleteMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getPropertiesAfterVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 2
+        }.verifyComplete()
+    }
+
+    @Unroll
+    def "Delete message invalid args"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        queueAsyncClient.enqueueMessage(expectMsg).block()
+        def dequeueMessage = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def deleteMessageId = messageId ? dequeueMessage.messageId() : dequeueMessage.messageId() + "Random"
+        def deletePopReceipt = popReceipt ? dequeueMessage.popReceipt() : dequeueMessage.popReceipt() + "Random"
+        def deleteMsgVerifier = StepVerifier.create(queueAsyncClient.deleteMessage(deleteMessageId, deletePopReceipt))
+        then:
+        deleteMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMsg)
+        }
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+    def "Update message"() {
+        given:
+        def updateMsg = "Updated test message"
+        queueAsyncClient.create().block()
+        queueAsyncClient.enqueueMessage("test message before update").block()
+
+        def dequeueMsg = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def updateMsgVerifier = StepVerifier.create(queueAsyncClient.updateMessage(updateMsg,
+            dequeueMsg.messageId(), dequeueMsg.popReceipt(), Duration.ofSeconds(1)))
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages().delaySubscription(Duration.ofSeconds(2)))
+        then:
+        updateMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        peekMsgVerifier.assertNext {
+            assert updateMsg.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    @Unroll
+    def "Update message invalid args"() {
+        given:
+        queueAsyncClient.create().block()
+        def updateMsg = "Updated test message"
+        queueAsyncClient.enqueueMessage("test message before update").block()
+        def dequeueMessage = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def updateMessageId = messageId ? dequeueMessage.messageId() : dequeueMessage.messageId() + "Random"
+        def updatePopReceipt = popReceipt ? dequeueMessage.popReceipt() : dequeueMessage.popReceipt() + "Random"
+        def updateMsgVerifier = StepVerifier.create(queueAsyncClient.updateMessage(updateMsg, updateMessageId, updatePopReceipt, Duration.ofSeconds(1)))
+        then:
+        updateMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMsg)
+        }
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAPITests.groovy
new file mode 100644
index 000000000000..2cbcdeb7875e
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAPITests.groovy
@@ -0,0 +1,170 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.storage.queue.QueueClient
+import com.azure.storage.queue.models.Logging
+import com.azure.storage.queue.models.Metrics
+import com.azure.storage.queue.models.QueueItem
+import com.azure.storage.queue.models.QueuesSegmentOptions
+import com.azure.storage.queue.models.RetentionPolicy
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageErrorException
+import com.azure.storage.queue.models.StorageServiceProperties
+import spock.lang.Unroll
+
+class QueueServiceAPITests extends APISpec {
+
+    def setup() {
+        primaryQueueServiceClient = queueServiceBuilderHelper(interceptorManager).buildClient()
+    }
+
+    def "Get queue client"() {
+        given:
+        def queueClient = primaryQueueServiceClient.getQueueClient(testResourceName.randomName(methodName, 60))
+        expect:
+        queueClient instanceof QueueClient
+    }
+
+    def "Create queue"() {
+        when:
+        def queueClientResponse = primaryQueueServiceClient.createQueue(testResourceName.randomName(methodName, 60))
+        def enqueueMessageResponse = queueClientResponse.value().enqueueMessage("Testing service client creating a queue")
+        then:
+        QueueTestHelper.assertResponseStatusCode(queueClientResponse, 201)
+        QueueTestHelper.assertResponseStatusCode(enqueueMessageResponse, 201)
+    }
+
+    @Unroll
+    def "Create queue with invalid name"() {
+        when:
+        primaryQueueServiceClient.createQueue(queueName)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMesage)
+        where:
+        queueName      | statusCode | errMesage
+        "a_b"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "-ab"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "a--b"         | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "Abc"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "ab"           | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+        "verylong" * 8 | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+    }
+
+    def "Create null"() {
+        when:
+        primaryQueueServiceClient.createQueue(null)
+        then:
+        thrown(NullPointerException)
+    }
+
+    @Unroll
+    def "Create queue maxOverload"() {
+        when:
+        def queueClientResponse = primaryQueueServiceClient.createQueue(testResourceName.randomName(methodName, 60), metadata)
+        def enqueueMessageResponse = queueClientResponse.value().enqueueMessage("Testing service client creating a queue")
+        then:
+        QueueTestHelper.assertResponseStatusCode(queueClientResponse, 201)
+        QueueTestHelper.assertResponseStatusCode(enqueueMessageResponse, 201)
+        where:
+        metadata                                       | _
+        null                                           | _
+        Collections.singletonMap("metadata", "value")  | _
+        Collections.singletonMap("metadata", "va@lue") | _
+    }
+
+    def "Create queue with invalid metadata"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 16)
+        when:
+        primaryQueueServiceClient.createQueue(queueName, Collections.singletonMap("meta@data", "value"))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, "Bad Request")
+    }
+
+    def "Delete queue"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        when:
+        def queueClient = primaryQueueServiceClient.createQueue(queueName).value()
+        def deleteQueueResponse = primaryQueueServiceClient.deleteQueue(queueName)
+        queueClient.enqueueMessage("Expecting exception as queue has been deleted.")
+        then:
+        QueueTestHelper.assertResponseStatusCode(deleteQueueResponse, 204)
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Delete queue error"() {
+        when:
+        primaryQueueServiceClient.deleteQueue(testResourceName.randomName(methodName, 60))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    @Unroll
+    def "List queues"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        LinkedList<QueueItem> testQueues = new LinkedList<>()
+        for (int i = 0; i < 3; i++) {
+            String version = Integer.toString(i)
+            QueueItem queue = new QueueItem().name(queueName + version)
+                .metadata(Collections.singletonMap("metadata" + version, "value" + version))
+            testQueues.add(queue)
+            primaryQueueServiceClient.createQueue(queue.name(), queue.metadata())
+        }
+        when:
+        def queueListIter = primaryQueueServiceClient.listQueues(options)
+        then:
+        queueListIter.each {
+            QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+            primaryQueueServiceClient.deleteQueue(it.name())
+        }
+        testQueues.size() == 0
+        where:
+        options                                                                                   | _
+        new QueuesSegmentOptions().prefix("queueserviceapitestslistqueues")                       | _
+        new QueuesSegmentOptions().prefix("queueserviceapitestslistqueues").maxResults(2)         | _
+        new QueuesSegmentOptions().prefix("queueserviceapitestslistqueues").includeMetadata(true) | _
+    }
+
+    def "List empty queues"() {
+        when:
+        primaryQueueServiceClient.getQueueClient(testResourceName.randomName(methodName, 60))
+        then:
+        !primaryQueueServiceClient.listQueues(new QueuesSegmentOptions().prefix(methodName)).iterator().hasNext()
+    }
+
+    def "Get and set properties"() {
+        given:
+        def originalProperties = primaryQueueServiceClient.getProperties().value()
+        def retentionPolicy = new RetentionPolicy().enabled(true)
+            .days(3)
+        def logging = new Logging().version("1.0")
+            .delete(true)
+            .write(true)
+            .retentionPolicy(retentionPolicy)
+        def metrics = new Metrics().enabled(true)
+            .includeAPIs(false)
+            .retentionPolicy(retentionPolicy)
+            .version("1.0")
+        def updatedProperties = new StorageServiceProperties().logging(logging)
+            .hourMetrics(metrics)
+            .minuteMetrics(metrics)
+            .cors(new ArrayList<>())
+
+        when:
+        def getResponseBefore = primaryQueueServiceClient.getProperties()
+        def setResponse = primaryQueueServiceClient.setProperties(updatedProperties)
+        def getResponseAfter = primaryQueueServiceClient.getProperties()
+        then:
+        QueueTestHelper.assertQueueServicePropertiesAreEqual(originalProperties, getResponseBefore.value())
+        QueueTestHelper.assertResponseStatusCode(setResponse, 202)
+        QueueTestHelper.assertQueueServicePropertiesAreEqual(updatedProperties, getResponseAfter.value())
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAsyncAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAsyncAPITests.groovy
new file mode 100644
index 000000000000..9464cdd9aa32
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAsyncAPITests.groovy
@@ -0,0 +1,200 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.storage.queue.QueueAsyncClient
+import com.azure.storage.queue.models.Logging
+import com.azure.storage.queue.models.Metrics
+import com.azure.storage.queue.models.QueueItem
+import com.azure.storage.queue.models.QueuesSegmentOptions
+import com.azure.storage.queue.models.RetentionPolicy
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageServiceProperties
+import reactor.test.StepVerifier
+import spock.lang.Unroll
+
+class QueueServiceAsyncAPITests extends APISpec {
+
+    def setup() {
+        primaryQueueServiceAsyncClient = queueServiceBuilderHelper(interceptorManager).buildAsyncClient()
+    }
+
+    def "Get queue client"() {
+        given:
+        def queueAsyncClient = primaryQueueServiceAsyncClient.getQueueAsyncClient(testResourceName.randomName(methodName, 60))
+        expect:
+        queueAsyncClient instanceof QueueAsyncClient
+    }
+
+    def "Create queue"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        expect:
+        StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName)).assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        StepVerifier.create(primaryQueueServiceAsyncClient.getQueueAsyncClient(queueName).enqueueMessage("Testing service client creating a queue"))
+            .assertNext {
+                assert QueueTestHelper.assertResponseStatusCode(it, 201)
+            }.verifyComplete()
+    }
+
+    @Unroll
+    def "Create queue with invalid name"() {
+        when:
+        def createQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName))
+        then:
+        createQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMesage)
+        }
+        where:
+        queueName      | statusCode | errMesage
+        "a_b"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "-ab"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "a--b"         | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "Abc"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "ab"           | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+        "verylong" * 8 | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+    }
+
+    def "Create null"() {
+        when:
+        primaryQueueServiceAsyncClient.createQueue(null)
+        then:
+        thrown(NullPointerException)
+    }
+
+    @Unroll
+    def "Create queue maxOverload"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        when:
+        def createQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName, metadata))
+        def enqueueMessageVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getQueueAsyncClient(queueName)
+            .enqueueMessage("Testing service client creating a queue"))
+        then:
+        createQueueVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        enqueueMessageVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+
+
+        where:
+        metadata                                       | _
+        null                                           | _
+        Collections.singletonMap("metadata", "value")  | _
+        Collections.singletonMap("metadata", "va@lue") | _
+    }
+
+    def "Create queue with invalid metadata"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        when:
+        def createQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName, Collections.singletonMap("meta@data", "value")))
+        then:
+        createQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, "Bad Request")
+        }
+    }
+
+    def "Delete queue"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        primaryQueueServiceAsyncClient.createQueue(queueName).block()
+        when:
+        def deleteQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.deleteQueue(queueName))
+        def enqueueMessageVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getQueueAsyncClient(queueName)
+            .enqueueMessage("Expecting exception as queue has been deleted."))
+        then:
+        deleteQueueVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        enqueueMessageVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Delete queue error"() {
+        when:
+        def deleteQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.deleteQueue(testResourceName.randomName(methodName, 16)))
+        then:
+        deleteQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    @Unroll
+    def "List queues"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        LinkedList<QueueItem> testQueues = new LinkedList<>()
+        for (int i = 0; i < 3; i++) {
+            String version = Integer.toString(i)
+            QueueItem queue = new QueueItem().name(queueName + version)
+                .metadata(Collections.singletonMap("metadata" + version, "value" + version))
+            testQueues.add(queue)
+            primaryQueueServiceAsyncClient.createQueue(queue.name(), queue.metadata()).block()
+        }
+        when:
+        def queueListVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.listQueues(options))
+        then:
+        queueListVerifier.assertNext {
+            assert QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+        }.assertNext {
+            assert QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+        }.assertNext {
+            assert QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+        }.verifyComplete()
+        where:
+        options                                                                                        | _
+        new QueuesSegmentOptions().prefix("queueserviceasyncapitestslistqueues")                       | _
+        new QueuesSegmentOptions().prefix("queueserviceasyncapitestslistqueues").maxResults(2)         | _
+        new QueuesSegmentOptions().prefix("queueserviceasyncapitestslistqueues").includeMetadata(true) | _
+    }
+
+    def "List empty queues"() {
+        when:
+        def listQueueVerifier = StepVerifier.create((primaryQueueServiceAsyncClient.listQueues(new QueuesSegmentOptions())))
+        then:
+        listQueueVerifier.assertNext {
+            !it.iterator().hasNext()
+        }
+    }
+
+    def "Get and set properties"() {
+        given:
+        def originalProperties = primaryQueueServiceAsyncClient.getProperties().block().value()
+        def retentionPolicy = new RetentionPolicy().enabled(true)
+            .days(3)
+        def logging = new Logging().version("1.0")
+            .delete(true)
+            .write(true)
+            .retentionPolicy(retentionPolicy)
+        def metrics = new Metrics().enabled(true)
+            .includeAPIs(false)
+            .retentionPolicy(retentionPolicy)
+            .version("1.0")
+        def updatedProperties = new StorageServiceProperties().logging(logging)
+            .hourMetrics(metrics)
+            .minuteMetrics(metrics)
+            .cors(new ArrayList<>())
+        when:
+        def getPropertiesBeforeVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getProperties())
+        def setPropertiesVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.setProperties(updatedProperties))
+        def getPropertiesAfterVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getProperties())
+        then:
+        getPropertiesBeforeVerifier.assertNext {
+            assert QueueTestHelper.assertQueueServicePropertiesAreEqual(originalProperties, it.value())
+        }
+        setPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 202)
+        }.verifyComplete()
+
+        getPropertiesAfterVerifier.assertNext {
+            assert QueueTestHelper.assertQueueServicePropertiesAreEqual(updatedProperties, it.value())
+        }.verifyComplete()
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueTestHelper.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueTestHelper.groovy
new file mode 100644
index 000000000000..63d6afeed4e4
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueTestHelper.groovy
@@ -0,0 +1,161 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.core.http.rest.Response
+import com.azure.core.implementation.util.ImplUtils
+import com.azure.core.util.configuration.ConfigurationManager
+import com.azure.storage.queue.models.CorsRule
+import com.azure.storage.queue.models.Logging
+import com.azure.storage.queue.models.Metrics
+import com.azure.storage.queue.models.QueueItem
+import com.azure.storage.queue.models.RetentionPolicy
+import com.azure.storage.queue.models.SignedIdentifier
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageErrorException
+import com.azure.storage.queue.models.StorageServiceProperties
+
+import java.time.Duration
+
+class QueueTestHelper {
+    static boolean assertResponseStatusCode(Response<?> response, int expectedStatusCode) {
+        return expectedStatusCode == response.statusCode()
+    }
+
+    static boolean assertExceptionStatusCodeAndMessage(Throwable throwable, int expectedStatusCode, String errMessage) {
+        return assertExceptionStatusCode(throwable, expectedStatusCode) && assertExceptionErrorMessage(throwable, errMessage)
+    }
+
+    static boolean assertExceptionStatusCodeAndMessage(Throwable throwable, int expectedStatusCode, StorageErrorCode errMessage) {
+        return assertExceptionStatusCode(throwable, expectedStatusCode) && assertExceptionErrorMessage(throwable, errMessage)
+    }
+
+    static boolean assertExceptionStatusCode(Throwable throwable, int expectedStatusCode) {
+        if (!throwable instanceof StorageErrorException) {
+            return false
+        }
+        StorageErrorException storageErrorException = (StorageErrorException) throwable
+        return expectedStatusCode == storageErrorException.response().statusCode()
+    }
+
+    static boolean assertExceptionErrorMessage(Throwable throwable, String errMessage) {
+        return throwable instanceof StorageErrorException && throwable.getMessage().contains(errMessage)
+    }
+
+    static boolean assertExceptionErrorMessage(Throwable throwable, StorageErrorCode errMessage) {
+        return throwable instanceof StorageErrorException && throwable.getMessage().contains(errMessage.toString())
+    }
+
+    static boolean assertQueuesAreEqual(QueueItem expected, QueueItem actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            if (!Objects.equals(expected.name(), actual.name())) {
+                return false
+            }
+            if (expected.metadata() != null && !ImplUtils.isNullOrEmpty(actual.metadata())) {
+                return expected.metadata().equals(actual.metadata())
+            }
+            return true
+        }
+    }
+
+    static boolean assertQueueServicePropertiesAreEqual(StorageServiceProperties expected, StorageServiceProperties actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return assertMetricsAreEqual(expected.hourMetrics(), actual.hourMetrics()) &&
+                assertMetricsAreEqual(expected.minuteMetrics(), actual.minuteMetrics()) &&
+                assertLoggingAreEqual(expected.logging(), actual.logging()) &&
+                assertCorsAreEqual(expected.cors(), actual.cors())
+        }
+    }
+
+    static boolean assertMetricsAreEqual(Metrics expected, Metrics actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.enabled(), actual.enabled()) &&
+                Objects.equals(expected.includeAPIs(), actual.includeAPIs()) &&
+                Objects.equals(expected.version(), actual.version()) &&
+                assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy())
+        }
+    }
+
+    static boolean assertLoggingAreEqual(Logging expected, Logging actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.read(), actual.read()) &&
+                Objects.equals(expected.write(), actual.write()) &&
+                Objects.equals(expected.delete(), actual.delete()) &&
+                Objects.equals(expected.version(), actual.version()) &&
+                assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy())
+        }
+    }
+
+    static boolean assertRetentionPoliciesAreEqual(RetentionPolicy expected, RetentionPolicy actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.days(), actual.days()) &&
+                Objects.equals(expected.enabled(), actual.enabled())
+        }
+    }
+
+    static boolean assertCorsAreEqual(List<CorsRule> expected, List<CorsRule> actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            if (expected.size() != actual.size()) {
+                return false
+            }
+            for (int i = 0; i < expected.size(); i++) {
+                if (!assertCorRulesAreEqual(expected.get(i), actual.get(i))) {
+                    return false
+                }
+            }
+            return true
+        }
+    }
+
+    static boolean assertCorRulesAreEqual(CorsRule expected, CorsRule actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.allowedHeaders(), actual.allowedHeaders()) &&
+                Objects.equals(expected.allowedMethods(), actual.allowedMethods()) &&
+                Objects.equals(expected.allowedOrigins(), actual.allowedOrigins()) &&
+                Objects.equals(expected.maxAgeInSeconds(), actual.maxAgeInSeconds())
+        }
+    }
+
+    static boolean assertPermissionsAreEqual(SignedIdentifier expected, SignedIdentifier actual) {
+        if (expected == null) {
+            return actual == null
+        }
+        if (expected.accessPolicy() == null) {
+            return actual.accessPolicy() == null
+        }
+        return Objects.equals(expected.id(), actual.id()) &&
+            Objects.equals(expected.accessPolicy().permission(), actual.accessPolicy().permission()) &&
+            Objects.equals(expected.accessPolicy().start(), actual.accessPolicy().start()) &&
+            Objects.equals(expected.accessPolicy().expiry(), actual.accessPolicy().expiry())
+    }
+
+    static void sleepInRecord(Duration time) {
+        String azureTestMode = ConfigurationManager.getConfiguration().get("AZURE_TEST_MODE")
+        if ("RECORD".equalsIgnoreCase(azureTestMode)) {
+            sleep(time)
+        }
+    }
+
+    private static void sleep(Duration time) {
+        try {
+            Thread.sleep(time.toMillis())
+        } catch (InterruptedException ex) {
+            // Ignore the error
+        }
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessages.json
similarity index 54%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessage.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessages.json
index a0d2027ab04f..ed54b9123e2f 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessage.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessages.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d53d-4003-00b9-6703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-request-id" : "86d0af92-d003-0034-1588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,74 +29,73 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d56d-4003-00b9-1003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5e400587-ca00-4a0e-a557-f8c4d2e2c6c7</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAzOOURANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
+      "x-ms-request-id" : "86d0af9b-d003-0034-1c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0d14b209-ac51-4fd3-8191-c134fc31ec65</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:23 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcmFdIohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages?numofmessages=1&visibilitytimeout=30",
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071d58c-4003-00b9-2f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5e400587-ca00-4a0e-a557-f8c4d2e2c6c7</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAMD99VgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:33 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af9e-d003-0034-1e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7c1347ef-6779-43f2-8b7f-6d33bfee66a3</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:23 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA7rliIohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages/5e400587-ca00-4a0e-a557-f8c4d2e2c6c7?popreceipt=AgAAAAMAAAAAAAAAMD99VgNH1QE%3d&visibilitytimeout=1",
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-time-next-visible" : "Tue, 30 Jul 2019 18:19:04 GMT",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d5ad-4003-00b9-5003-47d378000000",
-      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAA+cM6RQNH1QEBAAAA",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0afab-d003-0034-2888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>50d1dc30-e0f6-4af7-9361-7af98593d4e4</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:23 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAizloIohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages?peekonly=true",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "3",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071dba1-4003-00b9-0a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5e400587-ca00-4a0e-a557-f8c4d2e2c6c7</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>1</DequeueCount><MessageText>updated test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:05 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "86d0afae-d003-0034-2b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -104,25 +103,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071dbb7-4003-00b9-2003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:05 GMT"
+      "x-ms-request-id" : "86d0afb9-d003-0034-3388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dbd1-4003-00b9-3a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:05 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b033-d003-0034-1c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   } ],
-  "variables" : [ "queue20800231" ]
+  "variables" : [ "queueapitestsclearmessages581140c4bfcb340be45" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessagesError.json
new file mode 100644
index 000000000000..feb60836c10b
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessageserror122895bd11a3c794a/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b046-d003-0034-2e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b046-d003-0034-2e88-539fde000000\nTime:2019-08-15T16:40:24.6890548Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsclearmessageserror122895bd11a3c794a" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsCreateQueueWithSharedKey.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsCreateQueueWithSharedKey.json
new file mode 100644
index 000000000000..371a132c6bb3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsCreateQueueWithSharedKey.json
@@ -0,0 +1,20 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestscreatequeuewithsharedkey08458bcc81be1e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0a973-d003-0034-2088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:11 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestscreatequeuewithsharedkey08458bcc81be1e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteExistQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteExistQueue.json
new file mode 100644
index 000000000000..b40ca18da630
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteExistQueue.json
@@ -0,0 +1,36 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeleteexistqueue16092c5b3100623794",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aaa8-d003-0034-3a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:12 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeleteexistqueue16092c5b3100623794",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0aaab-d003-0034-3c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:12 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestsdeleteexistqueue16092c5b3100623794" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessage.json
similarity index 53%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessages.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessage.json
index cebb31166bc9..dca62988411f 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessages.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessage.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d18f-4003-00b9-5e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b058-d003-0034-3b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,17 +29,17 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d1bb-4003-00b9-0603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>1a1dabd1-b690-42c7-a22a-665c69ceffcc</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:02 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:02 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAi1HbQwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:02 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "86d0b05d-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>93569445-b0d1-4230-998c-3c502ddc767b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAv9gvI4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:24 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -48,17 +48,17 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d1dd-4003-00b9-2503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>c10ecce0-b3b6-4098-96ae-8aa611501ffb</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:02 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:02 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAVabiQwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:02 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "86d0b064-d003-0034-4588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0ee737df-f37c-41cc-8f4a-d53c7426e5cd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA7EI2I4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:24 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -67,51 +67,36 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d201-4003-00b9-4603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>962a6b38-e375-4fae-a052-8d25207ff09b</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:02 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:02 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAv9fnQwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:02 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "86d0b06d-d003-0034-4d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f2d85c0a-9cbe-43fa-9323-766e875322cc</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAjNA+I4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:24 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?numofmessages=1&visibilitytimeout=30",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "3",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d225-4003-00b9-6903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d23d-4003-00b9-8003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b072-d003-0034-5188-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>93569445-b0d1-4230-998c-3c502ddc767b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAZWgmNYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:54 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -119,17 +104,17 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
+      "x-ms-approximate-messages-count" : "3",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d257-4003-00b9-1703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b075-d003-0034-5488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages/93569445-b0d1-4230-998c-3c502ddc767b?popreceipt=AgAAAAMAAAAAAAAAZWgmNYhT1QE%3d",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -137,25 +122,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071d26d-4003-00b9-2d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b07b-d003-0034-5a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d283-4003-00b9-4303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-approximate-messages-count" : "2",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b083-d003-0034-6288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   } ],
-  "variables" : [ "queue78895e13" ]
+  "variables" : [ "queueapitestsdeletemessage20200a7539ef17c4a41" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs0.json
new file mode 100644
index 000000000000..dc272ed0c65c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs0.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b093-d003-0034-7088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b09d-d003-0034-7788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>04214a11-cec5-4791-ba97-8228b2da7a45</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA+yR7I4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:25 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b0a2-d003-0034-7b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>04214a11-cec5-4791-ba97-8228b2da7a45</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAADAtjNYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:55 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721/messages/04214a11-cec5-4791-ba97-8228b2da7a45?popreceipt=AgAAAAMAAAAAAAAADAtjNYhT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b0a5-d003-0034-7e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b0a5-d003-0034-7e88-539fde000000\nTime:2019-08-15T16:40:25.4037442Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAADAtjNYhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdeletemessageinvalidargs09162111d13721" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs1.json
similarity index 51%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMessage.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs1.json
index 235330aad38c..a4539a5b6961 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMessage.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071bb3b-4003-00b9-2f03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT"
+      "x-ms-request-id" : "86d0b0b6-d003-0034-0e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:25 GMT"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,17 +29,17 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071bb62-4003-00b9-5403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e019e0ee-2a4a-4a02-ba68-ecd484c51b2c</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:55 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:55 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAszfJPwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:55 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
+      "x-ms-request-id" : "86d0b0bd-d003-0034-1488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>34e78151-51d8-45fa-b3f4-f3e5a1e6c31f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAARv6kI4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:25 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:25 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6/messages?numofmessages=1&visibilitytimeout=30",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3/messages?numofmessages=1&visibilitytimeout=30",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -48,43 +48,30 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071bb7d-4003-00b9-6e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e019e0ee-2a4a-4a02-ba68-ecd484c51b2c</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:55 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:55 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAGAywUQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:25 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
+      "x-ms-request-id" : "86d0b0c0-d003-0034-1688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>34e78151-51d8-45fa-b3f4-f3e5a1e6c31f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAASb2MNYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:55 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:25 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3/messages/34e78151-51d8-45fa-b3f4-f3e5a1e6c31fRandom?popreceipt=AgAAAAMAAAAAAAAASb2MNYhT1QE%3d",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bb94-4003-00b9-0403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bbb2-4003-00b9-2103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT"
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b0c4-d003-0034-1a88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0b0c4-d003-0034-1a88-539fde000000\nTime:2019-08-15T16:40:26.7240160Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue854564d6" ]
+  "variables" : [ "queueapitestsdeletemessageinvalidargs158450b740d8f3" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs2.json
new file mode 100644
index 000000000000..b42487e3c437
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs2.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b156-d003-0034-1888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b15a-d003-0034-1b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d44b25ff-a01e-46c3-a447-96fe43f58dcc</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:26 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:26 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA2md0JIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:26 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b162-d003-0034-2288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d44b25ff-a01e-46c3-a447-96fe43f58dcc</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:26 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:26 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA7tRdNohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:57 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f/messages/d44b25ff-a01e-46c3-a447-96fe43f58dccRandom?popreceipt=AgAAAAMAAAAAAAAA7tRdNohT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b166-d003-0034-2688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b166-d003-0034-2688-539fde000000\nTime:2019-08-15T16:40:27.0473254Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAA7tRdNohT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdeletemessageinvalidargs2763886d20e03f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSharedKey.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteQueueError.json
similarity index 64%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSharedKey.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteQueueError.json
index f7db9ce0ce35..ca2f032e1942 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSharedKey.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteQueueError.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue07130666/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletequeueerror47957ce5611a14cab4",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,11 +13,11 @@
       "retry-after" : "0",
       "Content-Length" : "217",
       "StatusCode" : "404",
-      "x-ms-request-id" : "807249d1-4003-00b9-4903-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807249d1-4003-00b9-4903-47d378000000\nTime:2019-07-30T18:19:38.6260705Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
+      "x-ms-request-id" : "86d0aabe-d003-0034-4c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0aabe-d003-0034-4c88-539fde000000\nTime:2019-08-15T16:40:13.4041901Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:12 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue07130666" ]
+  "variables" : [ "queueapitestsdeletequeueerror47957ce5611a14cab4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMessage.json
new file mode 100644
index 000000000000..34052e1ef61a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemessage40686e81eb135e6394b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aea3-d003-0034-4888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemessage40686e81eb135e6394b/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aea8-d003-0034-4c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>37450095-9ca3-4ca2-99a1-bae358e91a42</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA9N08IYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemessage40686e81eb135e6394b/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aeae-d003-0034-5088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>37450095-9ca3-4ca2-99a1-bae358e91a42</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAHwcrM4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdequeuemessage40686e81eb135e6394b" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMultipleMessages.json
new file mode 100644
index 000000000000..cc703c743ce7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aeba-d003-0034-5c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aec1-d003-0034-6288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>1cd3a95f-913c-4ef2-a26c-ed2b2a46fa00</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAxQFpIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aed1-d003-0034-6f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>ac53ec4a-dc07-4a31-a089-3dbc2a66a05d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAADaFyIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda/messages?numofmessages=2&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aed7-d003-0034-7388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>1cd3a95f-913c-4ef2-a26c-ed2b2a46fa00</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcVxcM4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>ac53ec4a-dc07-4a31-a089-3dbc2a66a05d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcVxcM4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdequeuemultiplemessages96761fe8475eda" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueTooManyMessage.json
new file mode 100644
index 000000000000..6ff627a06894
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuetoomanymessage820232eb14b1658",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aee4-d003-0034-7f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuetoomanymessage820232eb14b1658/messages?numofmessages=33&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0aee9-d003-0034-0388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0aee9-d003-0034-0388-539fde000000\nTime:2019-08-15T16:40:22.1496102Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdequeuetoomanymessage820232eb14b1658" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueEmptyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueEmptyMessage.json
new file mode 100644
index 000000000000..3ecbe42fe7f1
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueEmptyMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueueemptymessage69434f760bff89a1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae5f-d003-0034-0c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueueemptymessage69434f760bff89a1/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae64-d003-0034-1088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0541e4ad-a35d-436e-adaa-1b7e39276645</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAWdTNIIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:20 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueueemptymessage69434f760bff89a1/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ae77-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0541e4ad-a35d-436e-adaa-1b7e39276645</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText /></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsenqueueemptymessage69434f760bff89a1" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueMessage.json
new file mode 100644
index 000000000000..b0caf47f0fb4
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuemessage05407f375599df86241",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae3a-d003-0034-6988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuemessage05407f375599df86241/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae45-d003-0034-7388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2593cc1c-1b8c-44ad-88a1-57fd2eba3fd6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAmIaYIIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:20 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuemessage05407f375599df86241/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ae51-d003-0034-7e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2593cc1c-1b8c-44ad-88a1-57fd2eba3fd6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsenqueuemessage05407f375599df86241" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueTimeToLive.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueTimeToLive.json
new file mode 100644
index 000000000000..31e4c78f7180
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueTimeToLive.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuetimetolive94210574071164c6f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae88-d003-0034-3088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuetimetolive94210574071164c6f/messages?visibilitytimeout=0&messagettl=2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae97-d003-0034-3d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>06a2ea01-3dc2-4a7d-b352-2a0471fface0</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 15 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAdiMiIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsenqueuetimetolive94210574071164c6f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicy.json
new file mode 100644
index 000000000000..7c104d49cf6b
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicy.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetaccesspolicy3986549d9a11fe03c4",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac98-d003-0034-0188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:16 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetaccesspolicy3986549d9a11fe03c4?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aca0-d003-0034-0888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers />",
+      "Date" : "Thu, 15 Aug 2019 16:40:17 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetaccesspolicy3986549d9a11fe03c4" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicyError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicyError.json
new file mode 100644
index 000000000000..fb065f326b17
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicyError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetaccesspolicyerror58413efeb5fdae94?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0ad6f-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0ad6f-d003-0034-3f88-539fde000000\nTime:2019-08-15T16:40:18.6602495Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetaccesspolicyerror58413efeb5fdae94" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetProperties.json
new file mode 100644
index 000000000000..81502bd84d67
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetProperties.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetproperties49283bebfe496c1124d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aad7-d003-0034-6388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetproperties49283bebfe496c1124d?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aae0-d003-0034-6b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetproperties49283bebfe496c1124d" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetPropertiesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetPropertiesError.json
new file mode 100644
index 000000000000..f2a64cf9961d
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetPropertiesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetpropertieserror86495a85dbf5a65c1?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0ab03-d003-0034-0988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0ab03-d003-0034-0988-539fde000000\nTime:2019-08-15T16:40:13.7735459Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetpropertieserror86495a85dbf5a65c1" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessage.json
new file mode 100644
index 000000000000..d2012bf8ba5f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessagequeueapitestspeekmessage944948491b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aef6-d003-0034-1088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessagequeueapitestspeekmessage944948491b/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aefe-d003-0034-1788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>33245f64-21f2-4a10-84c2-f010f339e2ae</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAR8O0IYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:22 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessagequeueapitestspeekmessage944948491b/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0af00-d003-0034-1988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>33245f64-21f2-4a10-84c2-f010f339e2ae</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeekmessagequeueapitestspeekmessage944948491b" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessagesError.json
new file mode 100644
index 000000000000..716f59b91442
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessageserror659934ae7b76e1ec7/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0af82-d003-0034-0988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0af82-d003-0034-0988-539fde000000\nTime:2019-08-15T16:40:23.3367515Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeekmessageserror659934ae7b76e1ec7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMultipleMessages.json
new file mode 100644
index 000000000000..4031845fa5cf
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af13-d003-0034-2c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af1d-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3a919a7a-35c7-4553-b19d-68b7d97f9ed8</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAPNbUIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:22 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af32-d003-0034-4688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2e8db9be-aa49-41a9-afb0-d9af0211f6b1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAfGz4IYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:22 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a/messages?numofmessages=2&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0af4b-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3a919a7a-35c7-4553-b19d-68b7d97f9ed8</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>2e8db9be-aa49-41a9-afb0-d9af0211f6b1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeekmultiplemessages99123b27adb7405a" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekTooManyMessage.json
new file mode 100644
index 000000000000..2e0cc4207f4c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeektoomanymessage8011625e0f9c2fd32",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af60-d003-0034-6c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeektoomanymessage8011625e0f9c2fd32/messages?numofmessages=33&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0af66-d003-0034-7088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0af66-d003-0034-7088-539fde000000\nTime:2019-08-15T16:40:23.2106294Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeektoomanymessage8011625e0f9c2fd32" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAccessPolicy.json
similarity index 50%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicy.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAccessPolicy.json
index cc3a358651b1..96f21b61b602 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicy.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAccessPolicy.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetaccesspolicy7404808264b0d36334",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "807244f3-4003-00b9-1603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0ad7a-d003-0034-4688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetaccesspolicy7404808264b0d36334?comp=acl",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,15 +29,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "80724521-4003-00b9-4103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0ad9a-d003-0034-5f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetaccesspolicy7404808264b0d36334?comp=acl",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -46,43 +46,11 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "80724540-4003-00b9-5f03-47d378000000",
+      "x-ms-request-id" : "86d0ad9e-d003-0034-6388-539fde000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>testpermission</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>raup</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT",
       "Content-Type" : "application/xml"
     }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724551-4003-00b9-7003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724569-4003-00b9-0803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
   } ],
-  "variables" : [ "queue392406b1" ]
+  "variables" : [ "queueapitestssetaccesspolicy7404808264b0d36334" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata0.json
similarity index 59%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicy.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata0.json
index f4583b3a1ca6..7b3c4ae923c0 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicy.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata0.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,34 +12,33 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d4c3-4003-00b9-7003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-request-id" : "86d0ab14-d003-0034-1888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d4e3-4003-00b9-0e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers />",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "86d0ab1c-d003-0034-1f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -47,25 +46,28 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071d4fb-4003-00b9-2603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-request-id" : "86d0ab22-d003-0034-2588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d50b-4003-00b9-3503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab36-d003-0034-3988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   } ],
-  "variables" : [ "queue9583269e" ]
+  "variables" : [ "queueapitestssetandclearmetadata069712b1b824a4f5a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata1.json
new file mode 100644
index 000000000000..0a9eb98b06e5
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata1.json
@@ -0,0 +1,74 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ab5e-d003-0034-5f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab66-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0ab6d-d003-0034-6d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab74-d003-0034-7488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestssetandclearmetadata1133922d063e915d5" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceSameMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata2.json
similarity index 58%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceSameMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata2.json
index 49af0912970a..7eb7f876733b 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceSameMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata2.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,31 +12,34 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8072446f-4003-00b9-1303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT"
+      "x-ms-request-id" : "86d0ab8b-d003-0034-0a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724495-4003-00b9-3803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab97-d003-0034-1588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -44,25 +47,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "807244ad-4003-00b9-5003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT"
+      "x-ms-request-id" : "86d0ab9f-d003-0034-1d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807244ca-4003-00b9-6d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aba3-d003-0034-2188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   } ],
-  "variables" : [ "queue8880966a" ]
+  "variables" : [ "queueapitestssetandclearmetadata2975245e5d3767672" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata3.json
new file mode 100644
index 000000000000..1ccfd178abb2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata3.json
@@ -0,0 +1,74 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0abc0-d003-0034-3d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0abc8-d003-0034-4488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0abcb-d003-0034-4788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0abdb-d003-0034-5588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestssetandclearmetadata3109857c8883f83ac" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata4.json
similarity index 62%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata4.json
index de90dd17f28c..41a4e1aaeb97 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata4.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071dcea-4003-00b9-4003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-request-id" : "86d0abf5-d003-0034-6d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -29,18 +29,16 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071dd11-4003-00b9-6603-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-request-id" : "86d0abf9-d003-0034-7088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -48,25 +46,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071dd3b-4003-00b9-0f03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-request-id" : "86d0ac00-d003-0034-7788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dd54-4003-00b9-2703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ac04-d003-0034-7b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   } ],
-  "variables" : [ "queue23765c5d" ]
+  "variables" : [ "queueapitestssetandclearmetadata4441364d33a3358d9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidAccessPolicy.json
new file mode 100644
index 000000000000..69072b76cfb7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidAccessPolicy.json
@@ -0,0 +1,40 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidaccesspolicy272461d7c8ddd05",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0adb1-d003-0034-7588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidaccesspolicy272461d7c8ddd05?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidXmlDocument",
+      "retry-after" : "0",
+      "Content-Length" : "371",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0adb5-d003-0034-7888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0adb5-d003-0034-7888-539fde000000\nTime:2019-08-15T16:40:19.3749389Z</Message><LineNumber>1</LineNumber><LinePosition>304</LinePosition><Reason>Signed identifier ID cannot be empty or over 64 characters in length</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidaccesspolicy272461d7c8ddd05" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
new file mode 100644
index 000000000000..d67771bd47f4
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
@@ -0,0 +1,38 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta086912efa51a8ecf394",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac2d-d003-0034-2288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta086912efa51a8ecf394?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "AuthenticationFailed",
+      "retry-after" : "0",
+      "Content-Length" : "787",
+      "StatusCode" : "403",
+      "x-ms-request-id" : "86d0ac31-d003-0034-2588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:86d0ac31-d003-0034-2588-539fde000000\nTime:2019-08-15T16:40:15.9366308Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'eFSCtqZMmfvr497wo8VI4QmqpGPc177ZljiKa2e1R9U=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 15 Aug 2019 16:40:15 GMT\n\n\n\n\n\nx-ms-client-request-id:0fc39ac3-c8b7-4559-9dc7-d7626792fc6c\nx-ms-meta-invalidmeta:value\nx-ms-version:2018-03-28\n/azstoragesdkaccount/queueapitestssetinvalidmeta086912efa51a8ecf394\ncomp:metadata'.</AuthenticationErrorDetail></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta086912efa51a8ecf394" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
new file mode 100644
index 000000000000..9bc7be9b6093
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta113448acbafb9121ae4",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac44-d003-0034-3888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta113448acbafb9121ae4?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ac47-d003-0034-3a88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0ac47-d003-0034-3a88-539fde000000\nTime:2019-08-15T16:40:16.1618482Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta113448acbafb9121ae4" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
new file mode 100644
index 000000000000..f382dd8feb4a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta2080827789296bb3fb4",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac5d-d003-0034-4d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta2080827789296bb3fb4?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ac62-d003-0034-5188-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0ac62-d003-0034-5188-539fde000000\nTime:2019-08-15T16:40:16.3650438Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta2080827789296bb3fb4" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json
new file mode 100644
index 000000000000..e9408913c72f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta34802248c56de5d4824",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac7c-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:16 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta34802248c56de5d4824?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "EmptyMetadataKey",
+      "retry-after" : "0",
+      "Content-Length" : "278",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ac84-d003-0034-6d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:86d0ac84-d003-0034-6d88-539fde000000\nTime:2019-08-15T16:40:16.5552281Z</Message><MetadataValue>value</MetadataValue></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:16 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta34802248c56de5d4824" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMetadataQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMetadataQueueError.json
new file mode 100644
index 000000000000..2db96a476326
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMetadataQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmetadataqueueerror215410bb255310f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0ac1d-d003-0034-1488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0ac1d-d003-0034-1488-539fde000000\nTime:2019-08-15T16:40:15.7774776Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetmetadataqueueerror215410bb255310f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMultipleAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMultipleAccessPolicies.json
new file mode 100644
index 000000000000..a9505d0667f9
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMultipleAccessPolicies.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmultipleaccesspolicies16522a4462e10",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0adcb-d003-0034-0c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmultipleaccesspolicies16522a4462e10?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0ade0-d003-0034-1f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmultipleaccesspolicies16522a4462e10?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0adfb-d003-0034-3788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>policy0</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy1</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy2</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetmultipleaccesspolicies16522a4462e10" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetTooManyAccessPolicies.json
similarity index 55%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetTooManyAccessPolicies.json
index 831f07e70edb..751949a2a5e5 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetTooManyAccessPolicies.json
@@ -1,43 +1,40 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue15204045?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssettoomanyaccesspolicies3701347c5c1a20",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidXmlDocument",
       "retry-after" : "0",
-      "Content-Length" : "294",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "80724e15-4003-00b9-6d03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:80724e15-4003-00b9-6d03-47d378000000\nTime:2019-07-30T18:19:39.7961551Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae24-d003-0034-5688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue15204045/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssettoomanyaccesspolicies3701347c5c1a20?comp=acl",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
+      "x-ms-error-code" : "InvalidXmlDocument",
       "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724e34-4003-00b9-0b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724e34-4003-00b9-0b03-47d378000000\nTime:2019-07-30T18:19:39.8241820Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
+      "Content-Length" : "294",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ae2b-d003-0034-5c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0ae2b-d003-0034-5c88-539fde000000\nTime:2019-08-15T16:40:20.2267603Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue15204045" ]
+  "variables" : [ "queueapitestssettoomanyaccesspolicies3701347c5c1a20" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessage.json
new file mode 100644
index 000000000000..dd811d7af558
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessage.json
@@ -0,0 +1,96 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b172-d003-0034-3288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b179-d003-0034-3688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>866fcfcf-4cf2-4300-8845-9ac23c9412fd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:27 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:27 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeLaeJIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:27 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b17f-d003-0034-3c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>866fcfcf-4cf2-4300-8845-9ac23c9412fd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:27 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:27 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA3RGHNohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:57 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages/866fcfcf-4cf2-4300-8845-9ac23c9412fd?popreceipt=AgAAAAMAAAAAAAAA3RGHNohT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-time-next-visible" : "Thu, 15 Aug 2019 16:40:28 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b187-d003-0034-4388-539fde000000",
+      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAAXrZIJYhT1QEBAAAA",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b24c-d003-0034-7988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>866fcfcf-4cf2-4300-8845-9ac23c9412fd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:27 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:27 GMT</ExpirationTime><DequeueCount>1</DequeueCount><MessageText>Updated test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:28 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessage06951bc591bb0333646" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs0.json
new file mode 100644
index 000000000000..c2bb5757978c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs0.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b262-d003-0034-0b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b268-d003-0034-1088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3d7de84c-5922-4d48-82f5-9553b755e13b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAATQkOJohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:29 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b26f-d003-0034-1688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3d7de84c-5922-4d48-82f5-9553b755e13b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAp3L5N4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:59 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09/messages/3d7de84c-5922-4d48-82f5-9553b755e13b?popreceipt=AgAAAAMAAAAAAAAAp3L5N4hT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b279-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b279-d003-0034-2088-539fde000000\nTime:2019-08-15T16:40:29.7699461Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAp3L5N4hT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessageinvalidargs045293d7291d09" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs1.json
new file mode 100644
index 000000000000..0913d3eafa66
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs1.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b28d-d003-0034-3488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b292-d003-0034-3888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6580708f-66e8-44e6-ba98-b8247beac271</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAh2xCJohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:29 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b297-d003-0034-3d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6580708f-66e8-44e6-ba98-b8247beac271</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAfCsqOIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:00 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf/messages/6580708f-66e8-44e6-ba98-b8247beac271Random?popreceipt=AgAAAAMAAAAAAAAAfCsqOIhT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b299-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0b299-d003-0034-3f88-539fde000000\nTime:2019-08-15T16:40:30.0582240Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessageinvalidargs176891560f8faf" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs2.json
new file mode 100644
index 000000000000..3cff8e232573
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs2.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2a7-d003-0034-4d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2ad-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3be89eec-a4f2-45ab-a197-b821b7d11f10</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:30 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:30 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcZtoJohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:30 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b2af-d003-0034-5488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3be89eec-a4f2-45ab-a197-b821b7d11f10</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:30 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:30 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAARQxQOIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:00 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f/messages/3be89eec-a4f2-45ab-a197-b821b7d11f10Random?popreceipt=AgAAAAMAAAAAAAAARQxQOIhT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b2b6-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b2b6-d003-0034-5b88-539fde000000\nTime:2019-08-15T16:40:30.3204768Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAARQxQOIhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessageinvalidargs273318b807b04f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessages.json
new file mode 100644
index 000000000000..a711e3c38c58
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessages.json
@@ -0,0 +1,129 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b714-d003-0034-3f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b71a-d003-0034-4488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a61f6509-9183-4eb9-ac29-1059bef85949</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAEb3/KohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b72e-d003-0034-5688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4a640ede-fbc9-4097-b825-3a0ec2ae05b0</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAHLEQK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b733-d003-0034-5a88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5edab073-8f3c-4a0e-8f78-6cfe7c4b5909</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA+6UWK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "3",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b73a-d003-0034-6188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b73f-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b74b-d003-0034-7188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsclearmessages2567745c37cf84523" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessagesError.json
new file mode 100644
index 000000000000..5d910550c22a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessageserror568252add7763d/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b769-d003-0034-0c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b769-d003-0034-0c88-539fde000000\nTime:2019-08-15T16:40:38.4563063Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsclearmessageserror568252add7763d" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsCreateQueueWithSharedKey.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsCreateQueueWithSharedKey.json
new file mode 100644
index 000000000000..c0b23667f8c5
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsCreateQueueWithSharedKey.json
@@ -0,0 +1,20 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestscreatequeuewithsharedkey2100736fe3e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2d8-d003-0034-7c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestscreatequeuewithsharedkey2100736fe3e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteExistQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteExistQueue.json
new file mode 100644
index 000000000000..a20509a553ac
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteExistQueue.json
@@ -0,0 +1,36 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeleteexistqueue35019918c3a4f50",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2e9-d003-0034-0c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeleteexistqueue35019918c3a4f50",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b2f1-d003-0034-1388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeleteexistqueue35019918c3a4f50" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessage.json
new file mode 100644
index 000000000000..78fe32bbd659
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessage.json
@@ -0,0 +1,148 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b780-d003-0034-1e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b789-d003-0034-2588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2bae208e-e182-4f46-99d3-802e85696bb7</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAxopkK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b7bd-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5ef9d501-16ee-46fa-948e-92efe33db2bb</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA+jyOK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b7c3-d003-0034-5888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>66929325-4169-46f6-9896-13ec28a9ab4f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKyCTK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b7cd-d003-0034-6088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2bae208e-e182-4f46-99d3-802e85696bb7</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA3nd9PYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "3",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b7d7-d003-0034-6a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages/2bae208e-e182-4f46-99d3-802e85696bb7?popreceipt=AgAAAAMAAAAAAAAA3nd9PYhT1QE%3d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b7dd-d003-0034-7088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "2",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b7e6-d003-0034-7888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessage4169294d235e7b53e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs0.json
new file mode 100644
index 000000000000..c5bee287ae31
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs0.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b811-d003-0034-2188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b81a-d003-0034-2888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cc32b131-2313-4b2f-ad90-3c488f10aa7e</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAM23TK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:39 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b822-d003-0034-2f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cc32b131-2313-4b2f-ad90-3c488f10aa7e</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAGQW7PYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:09 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c/messages/cc32b131-2313-4b2f-ad90-3c488f10aa7e?popreceipt=AgAAAAMAAAAAAAAAGQW7PYhT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b832-d003-0034-3d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b832-d003-0034-3d88-539fde000000\nTime:2019-08-15T16:40:39.4532674Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAGQW7PYhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessageinvalidargs08956721757c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs1.json
new file mode 100644
index 000000000000..a08c635e6dd8
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs1.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b851-d003-0034-5888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b855-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cce066f1-dccd-40ef-9cdf-49ee0abf187f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKjH+K4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:39 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b880-d003-0034-0588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cce066f1-dccd-40ef-9cdf-49ee0abf187f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAtYILPohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:09 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7/messages/cce066f1-dccd-40ef-9cdf-49ee0abf187fRandom?popreceipt=AgAAAAMAAAAAAAAAtYILPohT1QE%3d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b896-d003-0034-1988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0b896-d003-0034-1988-539fde000000\nTime:2019-08-15T16:40:39.9947896Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessageinvalidargs139342f37ce7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs2.json
new file mode 100644
index 000000000000..e9745e23d903
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs2.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b8ac-d003-0034-2e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b8b6-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7e87aa91-446d-4d94-b215-499b6b6eb968</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKuBTLIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:40 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b8ca-d003-0034-4288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7e87aa91-446d-4d94-b215-499b6b6eb968</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAu6VCPohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:10 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46/messages/7e87aa91-446d-4d94-b215-499b6b6eb968Random?popreceipt=AgAAAAMAAAAAAAAAu6VCPohT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b8e8-d003-0034-5e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b8e8-d003-0034-5e88-539fde000000\nTime:2019-08-15T16:40:40.4482269Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAu6VCPohT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessageinvalidargs2341209dfb46" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteQueueError.json
new file mode 100644
index 000000000000..28150a0ec5eb
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletequeueerror841810489e711bf",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b2f9-d003-0034-1b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b2f9-d003-0034-1b88-539fde000000\nTime:2019-08-15T16:40:30.9681013Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletequeueerror841810489e711bf" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMessage.json
new file mode 100644
index 000000000000..3c3216aab4fe
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemessage34127c045be0e4fc",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b571-d003-0034-4c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemessage34127c045be0e4fc/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b576-d003-0034-5088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>13b53b78-978f-45ea-b9f3-ff7dde5fbfc6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAjVPRKYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemessage34127c045be0e4fc/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b588-d003-0034-5e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>13b53b78-978f-45ea-b9f3-ff7dde5fbfc6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeUrFO4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdequeuemessage34127c045be0e4fc" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMultipleMessages.json
new file mode 100644
index 000000000000..ece1c39197f3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b59a-d003-0034-6e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b5a1-d003-0034-7488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f4f91806-40cc-44ce-b6d9-190aa231e712</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA5MH/KYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b5a6-d003-0034-7988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d247edfb-148b-4ced-bba3-086e248b11cf</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAO3oGKohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696/messages?numofmessages=2&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b5b1-d003-0034-0388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f4f91806-40cc-44ce-b6d9-190aa231e712</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAk9j3O4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>d247edfb-148b-4ced-bba3-086e248b11cf</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAk9j3O4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdequeuemultiplemessages92682dd8f696" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueTooManyMessage.json
new file mode 100644
index 000000000000..88673523a9ef
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuetoomanymessage93456993efa0c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b5f1-d003-0034-3e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuetoomanymessage93456993efa0c/messages?numofmessages=33&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b5ff-d003-0034-4b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0b5ff-d003-0034-4b88-539fde000000\nTime:2019-08-15T16:40:36.7857017Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdequeuetoomanymessage93456993efa0c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueEmptyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueEmptyMessage.json
new file mode 100644
index 000000000000..fc93aefae27a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueEmptyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueueemptymessage777007b0c97652",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b544-d003-0034-2188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueueemptymessage777007b0c97652/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b54d-d003-0034-2988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cf835a57-768b-4887-ad77-b58cfe5a49bd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAMZ+TKYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsenqueueemptymessage777007b0c97652" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueMessage.json
new file mode 100644
index 000000000000..e800017754bc
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuemessage918982b8274b3853",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b51c-d003-0034-7c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuemessage918982b8274b3853/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b526-d003-0034-0588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>331a480a-83cd-4c6d-bd42-64a1878d57f3</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbbBqKYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsenqueuemessage918982b8274b3853" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueTimeToLive.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueTimeToLive.json
new file mode 100644
index 000000000000..e05acbb8dae2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueTimeToLive.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuetimetolive942001ea0bb1007",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b55d-d003-0034-3988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuetimetolive942001ea0bb1007/messages?visibilitytimeout=0&messagettl=2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b564-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4dfa6c0e-0faa-4f92-9327-4fc14c151027</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 15 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKzm1KYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsenqueuetimetolive942001ea0bb1007" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicy.json
new file mode 100644
index 000000000000..3288923c2dd0
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicy.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetaccesspolicy13402477ddf897a6",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b45e-d003-0034-5388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetaccesspolicy13402477ddf897a6?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b469-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers />",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetaccesspolicy13402477ddf897a6" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicyDoesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicyDoesError.json
new file mode 100644
index 000000000000..af256fc76af8
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicyDoesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetaccesspolicydoeserror56212d23d22?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b489-d003-0034-7888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b489-d003-0034-7888-539fde000000\nTime:2019-08-15T16:40:34.0060234Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetaccesspolicydoeserror56212d23d22" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetProperties.json
new file mode 100644
index 000000000000..d9603b7d9e31
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetProperties.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetproperties7430531cdaa42d19a",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b303-d003-0034-2388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetproperties7430531cdaa42d19a?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b30e-d003-0034-2a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetproperties7430531cdaa42d19a" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetPropertiesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetPropertiesError.json
new file mode 100644
index 000000000000..457195c34d0f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetPropertiesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetpropertieserror93872b7a1476bc?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b326-d003-0034-3c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b326-d003-0034-3c88-539fde000000\nTime:2019-08-15T16:40:31.3074281Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetpropertieserror93872b7a1476bc" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessage.json
new file mode 100644
index 000000000000..25a3ea95b585
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessage47817372b7f2dd8224",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b643-d003-0034-0888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessage47817372b7f2dd8224/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b654-d003-0034-1488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6dc6a926-5c00-44f4-8de2-e89c54c611da</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA/u17KohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessage47817372b7f2dd8224/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b661-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6dc6a926-5c00-44f4-8de2-e89c54c611da</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeekmessage47817372b7f2dd8224" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessagesError.json
new file mode 100644
index 000000000000..7126fe327311
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessageserror93819ee1f00a5b7/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b707-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b707-d003-0034-3488-539fde000000\nTime:2019-08-15T16:40:37.8036777Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeekmessageserror93819ee1f00a5b7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMultipleMessages.json
new file mode 100644
index 000000000000..a047b153bf5a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b67a-d003-0034-3988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b687-d003-0034-4588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>62f01e0b-b0a0-462f-a8b7-503c6dce7bf2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAACb2gKohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b691-d003-0034-4d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>971fc67e-a10f-42a0-85ba-d16ef58d30d9</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAihWmKohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747/messages?numofmessages=2&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b6ac-d003-0034-6688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>62f01e0b-b0a0-462f-a8b7-503c6dce7bf2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>971fc67e-a10f-42a0-85ba-d16ef58d30d9</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeekmultiplemessages0423782806747" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekTooManyMessage.json
new file mode 100644
index 000000000000..13518cbf820a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeektoomanymessage67437d1be16832",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b6e1-d003-0034-1088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeektoomanymessage67437d1be16832/messages?numofmessages=33&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b6f1-d003-0034-1f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0b6f1-d003-0034-1f88-539fde000000\nTime:2019-08-15T16:40:37.6515310Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeektoomanymessage67437d1be16832" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAccessPolicy.json
new file mode 100644
index 000000000000..a9be7cf8b45d
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAccessPolicy.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetaccesspolicy18055e6054856759",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b493-d003-0034-0188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetaccesspolicy18055e6054856759?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b49b-d003-0034-0888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetaccesspolicy18055e6054856759?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b49f-d003-0034-0c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>testpermission</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>raup</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetaccesspolicy18055e6054856759" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata0.json
new file mode 100644
index 000000000000..39a66b3fea58
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata0.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b330-d003-0034-4588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b33b-d003-0034-4f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b346-d003-0034-5a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b34c-d003-0034-6088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetandclearmetadata0775692feb2e02" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceDifferentMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata1.json
similarity index 58%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceDifferentMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata1.json
index 70bd9c8373e7..7ed34369afe8 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceDifferentMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,34 +12,34 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "807246c6-4003-00b9-5d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0b35e-d003-0034-7288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueAlreadyExists",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "222",
-      "StatusCode" : "409",
-      "x-ms-request-id" : "807246f2-4003-00b9-0403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueAlreadyExists</Code><Message>The specified queue already exists.\nRequestId:807246f2-4003-00b9-0403-47d378000000\nTime:2019-07-30T18:19:37.7522623Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b364-d003-0034-7788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -47,25 +47,28 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "80724708-4003-00b9-1a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0b369-d003-0034-7c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724714-4003-00b9-2503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b36d-d003-0034-8088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   } ],
-  "variables" : [ "queue60199648" ]
+  "variables" : [ "queueaysncapitestssetandclearmetadata16389313ee0457" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata2.json
new file mode 100644
index 000000000000..f65ae6875bfb
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata2.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b382-d003-0034-1188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b388-d003-0034-1688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b38c-d003-0034-1a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b390-d003-0034-1e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetandclearmetadata2207469fbef13f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata3.json
new file mode 100644
index 000000000000..76ba1d97280a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata3.json
@@ -0,0 +1,74 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b3a5-d003-0034-3088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b3ab-d003-0034-3588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b3b1-d003-0034-3a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b3b6-d003-0034-3e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetandclearmetadata3352166135e768" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata4.json
similarity index 62%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/getProperties.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata4.json
index c603492afe88..5910a551d6c3 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getProperties.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata4.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d0a9-4003-00b9-7f03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b3c7-d003-0034-4f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -29,18 +29,16 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d0df-4003-00b9-3403-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b3cf-d003-0034-5688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -48,25 +46,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071d0ff-4003-00b9-5303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b3d3-d003-0034-5a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d123-4003-00b9-7703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b3d7-d003-0034-5e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   } ],
-  "variables" : [ "queue98021a59" ]
+  "variables" : [ "queueaysncapitestssetandclearmetadata4960994418e531" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidAccessPolicy.json
new file mode 100644
index 000000000000..9c6ac803b9f8
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidAccessPolicy.json
@@ -0,0 +1,40 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidaccesspolicy33486e6d29ea",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b4b6-d003-0034-2088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidaccesspolicy33486e6d29ea?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidXmlDocument",
+      "retry-after" : "0",
+      "Content-Length" : "371",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b4c0-d003-0034-2788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0b4c0-d003-0034-2788-539fde000000\nTime:2019-08-15T16:40:34.4924928Z</Message><LineNumber>1</LineNumber><LinePosition>304</LinePosition><Reason>Signed identifier ID cannot be empty or over 64 characters in length</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidaccesspolicy33486e6d29ea" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
new file mode 100644
index 000000000000..b88111954c67
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
@@ -0,0 +1,38 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta01683215ccccf91c2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b3f6-d003-0034-7988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta01683215ccccf91c2?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "AuthenticationFailed",
+      "retry-after" : "0",
+      "Content-Length" : "790",
+      "StatusCode" : "403",
+      "x-ms-request-id" : "86d0b401-d003-0034-0288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:86d0b401-d003-0034-0288-539fde000000\nTime:2019-08-15T16:40:33.1201697Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'e+GF4D6YPu1FAAvKG8lumPMuaoEpcPbaCCWI3NCVxQ8=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 15 Aug 2019 16:40:33 GMT\n\n\n\n\n\nx-ms-client-request-id:5d04df0d-c387-4de8-8021-1db1a744ee09\nx-ms-meta-invalidmeta:value\nx-ms-version:2018-03-28\n/azstoragesdkaccount/queueaysncapitestssetinvalidmeta01683215ccccf91c2\ncomp:metadata'.</AuthenticationErrorDetail></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta01683215ccccf91c2" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
new file mode 100644
index 000000000000..6ee282eda8d3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta1355070856bfd3545",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b414-d003-0034-1288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta1355070856bfd3545?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b416-d003-0034-1388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0b416-d003-0034-1388-539fde000000\nTime:2019-08-15T16:40:33.2923348Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta1355070856bfd3545" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
new file mode 100644
index 000000000000..da2ee9274904
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta275909d41ee97d45b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b428-d003-0034-2288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta275909d41ee97d45b?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b42e-d003-0034-2788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0b42e-d003-0034-2788-539fde000000\nTime:2019-08-15T16:40:33.4715096Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta275909d41ee97d45b" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json
new file mode 100644
index 000000000000..e55852f38e1f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta350468db0a5487ffa",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b43c-d003-0034-3588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta350468db0a5487ffa?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "EmptyMetadataKey",
+      "retry-after" : "0",
+      "Content-Length" : "278",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b446-d003-0034-3e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:86d0b446-d003-0034-3e88-539fde000000\nTime:2019-08-15T16:40:33.6326628Z</Message><MetadataValue>value</MetadataValue></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta350468db0a5487ffa" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMetadataQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMetadataQueueError.json
new file mode 100644
index 000000000000..3ae851d04a98
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMetadataQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmetadataqueueerror74958551a725e?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b3e6-d003-0034-6c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b3e6-d003-0034-6c88-539fde000000\nTime:2019-08-15T16:40:32.9049634Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetmetadataqueueerror74958551a725e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMultipleAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMultipleAccessPolicies.json
new file mode 100644
index 000000000000..4e1877b8f62d
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMultipleAccessPolicies.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmultipleaccesspolicies342073fd3a7",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b4d8-d003-0034-3d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmultipleaccesspolicies342073fd3a7?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b4e0-d003-0034-4488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmultipleaccesspolicies342073fd3a7?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b4ee-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>policy0</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy1</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy2</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetmultipleaccesspolicies342073fd3a7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetTooManyAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetTooManyAccessPolicies.json
new file mode 100644
index 000000000000..666a75494585
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetTooManyAccessPolicies.json
@@ -0,0 +1,40 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssettoomanyaccesspolicies064709aed35",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b503-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssettoomanyaccesspolicies064709aed35?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidXmlDocument",
+      "retry-after" : "0",
+      "Content-Length" : "294",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b50d-d003-0034-6d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0b50d-d003-0034-6d88-539fde000000\nTime:2019-08-15T16:40:35.0590380Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssettoomanyaccesspolicies064709aed35" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessage.json
new file mode 100644
index 000000000000..4e7971e698f7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessage.json
@@ -0,0 +1,96 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b911-d003-0034-0788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b918-d003-0034-0d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4e5ffd01-82ac-44ee-a37d-526ab678478d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAZx6cLIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:40 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b925-d003-0034-1988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4e5ffd01-82ac-44ee-a37d-526ab678478d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAW92DPohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:10 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages/4e5ffd01-82ac-44ee-a37d-526ab678478d?popreceipt=AgAAAAMAAAAAAAAAW92DPohT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-time-next-visible" : "Thu, 15 Aug 2019 16:40:41 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b933-d003-0034-2788-539fde000000",
+      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAAhYVDLYhT1QEBAAAA",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ba71-d003-0034-5888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4e5ffd01-82ac-44ee-a37d-526ab678478d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><DequeueCount>1</DequeueCount><MessageText>Updated test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessage4445813bb0fe8e591" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs0.json
new file mode 100644
index 000000000000..71fa55e9834c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs0.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ba95-d003-0034-7888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ba9d-d003-0034-7d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>ed0c89e4-9fc0-4d1c-b6d7-e558cda27df2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAxNcTLohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0baa4-d003-0034-0288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>ed0c89e4-9fc0-4d1c-b6d7-e558cda27df2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAJjP8P4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6/messages/ed0c89e4-9fc0-4d1c-b6d7-e558cda27df2?popreceipt=AgAAAAMAAAAAAAAAJjP8P4hT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0baae-d003-0034-0b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0baae-d003-0034-0b88-539fde000000\nTime:2019-08-15T16:40:43.2038761Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAJjP8P4hT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessageinvalidargs081201908aa6" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs1.json
new file mode 100644
index 000000000000..8a058a925169
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs1.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bac1-d003-0034-1b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0baca-d003-0034-2188-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>bbfff9d1-bc64-428c-b460-f1419acc90a1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA/RA/LohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0bace-d003-0034-2588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>bbfff9d1-bc64-428c-b460-f1419acc90a1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAdgwmQIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678/messages/bbfff9d1-bc64-428c-b460-f1419acc90a1Random?popreceipt=AgAAAAMAAAAAAAAAdgwmQIhT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0bad4-d003-0034-2b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0bad4-d003-0034-2b88-539fde000000\nTime:2019-08-15T16:40:43.4651281Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessageinvalidargs163307d0c678" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs2.json
new file mode 100644
index 000000000000..40ebda4b09ea
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs2.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0baed-d003-0034-4388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0baf4-d003-0034-4988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>25b1663b-0917-4820-82ab-4841c1326b31</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAc4pnLohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0bafb-d003-0034-4e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>25b1663b-0917-4820-82ab-4841c1326b31</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAABdROQIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd/messages/25b1663b-0917-4820-82ab-4841c1326b31Random?popreceipt=AgAAAAMAAAAAAAAABdROQIhT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb0a-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0bb0a-d003-0034-5b88-539fde000000\nTime:2019-08-15T16:40:43.7233771Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAABdROQIhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessageinvalidargs230456b8e3fd" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateNull.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateNull.json
new file mode 100644
index 000000000000..ba5f37f8f855
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateNull.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueue.json
new file mode 100644
index 000000000000..dc2a5a0a32e5
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueue.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeue074371e62a4ccfd46",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bb2f-d003-0034-7d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeue074371e62a4ccfd46/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bb38-d003-0034-0588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2e77531c-f441-41ef-9ff6-b6322409ae69</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAExyYLohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeue074371e62a4ccfd46" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload0.json
new file mode 100644
index 000000000000..484cc8e29533
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload0.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload074849a8610c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbb3-d003-0034-7588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload074849a8610c/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbc2-d003-0034-0288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>9c9a313c-99a1-4d0b-927f-94cf777190ef</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:44 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:44 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALE0xL4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:44 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeuemaxoverload074849a8610c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload1.json
new file mode 100644
index 000000000000..060f4484235a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload182562dfc26f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbdd-d003-0034-1b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload182562dfc26f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbe7-d003-0034-2388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7662fa88-d012-476e-8db1-0438feb9d9b6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:45 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:45 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAd0BNL4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:45 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeuemaxoverload182562dfc26f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload2.json
new file mode 100644
index 000000000000..89ca2b0ebfbc
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload2383601fe697",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbfd-d003-0034-3688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload2383601fe697/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bc06-d003-0034-3e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a8cc78e1-6d22-47a4-9b1d-5af87883ad21</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:45 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:45 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAogxpL4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:45 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeuemaxoverload2383601fe697" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidMetadata.json
new file mode 100644
index 000000000000..54410b10741f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidMetadata.json
@@ -0,0 +1,21 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/3fb1a9c3baec4586",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "Connection" : "close",
+      "retry-after" : "0",
+      "Content-Length" : "339",
+      "StatusCode" : "400",
+      "Body" : "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\"http://www.w3.org/TR/html4/strict.dtd\">\r\n<HTML><HEAD><TITLE>Bad Request</TITLE>\r\n<META HTTP-EQUIV=\"Content-Type\" Content=\"text/html; charset=us-ascii\"></HEAD>\r\n<BODY><h2>Bad Request - Invalid Header</h2>\r\n<hr><p>HTTP Error 400. The request has an invalid header name.</p>\r\n</BODY></HTML>\r\n",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "text/html; charset=us-ascii"
+    }
+  } ],
+  "variables" : [ "3fb1a9c3baec4586" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName0.json
new file mode 100644
index 000000000000..525fd6e4ea87
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName0.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a_b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb53-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb53-d003-0034-2088-539fde000000\nTime:2019-08-15T16:40:44.2939271Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName1.json
new file mode 100644
index 000000000000..18fd8e02e7f3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName1.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/-ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb5d-d003-0034-2988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb5d-d003-0034-2988-539fde000000\nTime:2019-08-15T16:40:44.3950248Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName2.json
new file mode 100644
index 000000000000..6dc9821c78d2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName2.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a--b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb69-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb69-d003-0034-3488-539fde000000\nTime:2019-08-15T16:40:44.4961229Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName3.json
new file mode 100644
index 000000000000..e63f4a5b7881
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName3.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/Abc",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb7c-d003-0034-4788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb7c-d003-0034-4788-539fde000000\nTime:2019-08-15T16:40:44.5872096Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName4.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName4.json
new file mode 100644
index 000000000000..cd17d136fdfe
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName4.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb88-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:86d0bb88-d003-0034-5288-539fde000000\nTime:2019-08-15T16:40:44.6823024Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName5.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName5.json
new file mode 100644
index 000000000000..ed1dfa6d0392
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName5.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/verylongverylongverylongverylongverylongverylongverylongverylong",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb9f-d003-0034-6488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:86d0bb9f-d003-0034-6488-539fde000000\nTime:2019-08-15T16:40:44.7723883Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueue.json
new file mode 100644
index 000000000000..6b0c052b62a7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueue.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeue42052e8daafc75e56",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9c804-2003-0008-6c88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeue42052e8daafc75e56",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "b9c9c80f-2003-0008-7588-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeue42052e8daafc75e56/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "b9c9c819-2003-0008-7d88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9c819-2003-0008-7d88-532b05000000\nTime:2019-08-15T16:40:45.8743783Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestsdeletequeue42052e8daafc75e56" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueueError.json
new file mode 100644
index 000000000000..4dcc7458529f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeueerror1100262e3172b5",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "b9c9c827-2003-0008-0988-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9c827-2003-0008-0988-532b05000000\nTime:2019-08-15T16:40:45.9754728Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestsdeletequeueerror1100262e3172b5" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetAndSetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetAndSetProperties.json
new file mode 100644
index 000000000000..d0be4644da50
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetAndSetProperties.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882d4f-6003-00ea-4088-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882d82-6003-00ea-6f88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-id" : "14882da7-6003-00ea-1288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:48 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882ebe-6003-00ea-1488-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:48 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetQueueClient.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetQueueClient.json
new file mode 100644
index 000000000000..dbb9e99a8d2a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetQueueClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ "queueserviceapitestsgetqueueclient02320715bfd10cd" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListEmptyQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListEmptyQueues.json
new file mode 100644
index 000000000000..de513b4009ee
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListEmptyQueues.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=QueueServiceAPITestsListEmptyQueues&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882d28-6003-00ea-1b88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>QueueServiceAPITestsListEmptyQueues</Prefix><Queues /><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestslistemptyqueues28264ca30cb29e2" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues0.json
similarity index 54%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues0.json
index cc245715abd6..84f3a0f6abae 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues0.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b220",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,50 +12,47 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd82b9-e003-0073-5c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c84f-2003-0008-2b88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b221",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
+      "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd82bd-e003-0073-5f09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a1a192f0-d5b6-4a03-8365-eafbc589b4b0</MessageId><InsertionTime>Tue, 30 Jul 2019 19:01:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 19:01:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAW6ZEJAlH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 19:01:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "b9c9c86a-2003-0008-4488-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b222",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82c6-e003-0073-6609-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9c86f-2003-0008-4888-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182/messages?peekonly=true",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -64,36 +61,33 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd82cc-e003-0073-6c09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a1a192f0-d5b6-4a03-8365-eafbc589b4b0</MessageId><InsertionTime>Tue, 30 Jul 2019 19:01:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 19:01:06 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>Testing service client creating the same queue twice does not modify the queue</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
+      "x-ms-request-id" : "b9c9c87b-2003-0008-5188-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceapitestslistqueues0197608aaded4b7b220</Name></Queue><Queue><Name>queueserviceapitestslistqueues0197608aaded4b7b221</Name></Queue><Queue><Name>queueserviceapitestslistqueues0197608aaded4b7b222</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue74324182&include=&comp=list",
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b220",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd82d9-e003-0073-7909-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue74324182</Prefix><Queues><Queue><Name>queue74324182</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "b9c9c880-2003-0008-5688-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b221",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -101,15 +95,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82e0-e003-0073-7f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
+      "x-ms-request-id" : "b9c9c888-2003-0008-5c88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b222",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -117,9 +111,9 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82e9-e003-0073-0709-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
+      "x-ms-request-id" : "b9c9c895-2003-0008-6788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   } ],
-  "variables" : [ "queue74324182" ]
+  "variables" : [ "queueserviceapitestslistqueues0197608aaded4b7b22" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues1.json
similarity index 51%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueues.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues1.json
index 60f43a830052..d529b881dd91 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueues.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd50",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8272-e003-0073-1c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c89f-2003-0008-6f88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd51",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -28,15 +28,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8278-e003-0073-2109-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c8ab-2003-0008-7788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd52",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -44,15 +44,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd827e-e003-0073-2609-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c8b0-2003-0008-7b88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue53815dd5&include=&comp=list",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -61,17 +61,17 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8286-e003-0073-2d09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue53815dd5</Prefix><Queues><Queue><Name>queue53815dd50</Name></Queue><Queue><Name>queue53815dd51</Name></Queue><Queue><Name>queue53815dd52</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
+      "x-ms-request-id" : "b9c9c8bd-2003-0008-0588-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceapitestslistqueues1262287461f7bb9c2c0</Name></Queue><Queue><Name>queueserviceapitestslistqueues1262287461f7bb9c2c1</Name></Queue></Queues><NextMarker>/azstoragesdkaccount/queueserviceapitestslistqueues1262287461f7bb9c2c2</NextMarker></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue53815dd5&include=&comp=list",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&marker=/azstoragesdkaccount/queueserviceapitestslistqueues1262287461f7bb9c2c2&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -80,17 +80,17 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd828a-e003-0073-3109-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue53815dd5</Prefix><Queues><Queue><Name>queue53815dd50</Name></Queue><Queue><Name>queue53815dd51</Name></Queue><Queue><Name>queue53815dd52</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
+      "x-ms-request-id" : "b9c9c8c6-2003-0008-0b88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><Marker>/azstoragesdkaccount/queueserviceapitestslistqueues1262287461f7bb9c2c2</Marker><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceapitestslistqueues1262287461f7bb9c2c2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd50/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -98,15 +98,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd828e-e003-0073-3409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "14882a79-6003-00ea-1088-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd50",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -114,15 +114,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8292-e003-0073-3809-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "14882b6a-6003-00ea-7588-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd51/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -130,57 +130,9 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd829b-e003-0073-3f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd51",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82a2-e003-0073-4509-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd52/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82a8-e003-0073-4b09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd52",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82b1-e003-0073-5409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "14882b7e-6003-00ea-0988-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   } ],
-  "variables" : [ "queue53815dd5" ]
+  "variables" : [ "queueserviceapitestslistqueues1262287461f7bb9c2c" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues2.json
similarity index 53%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessage.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues2.json
index f3bcf1a4fbf6..0284f7c87a30 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessage.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues2.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,87 +12,82 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "807248e4-4003-00b9-6403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "x-ms-request-id" : "14882bad-6003-00ea-3688-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
+      "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "80724919-4003-00b9-1703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>70decbfa-af3b-453f-b291-f78c97eb512d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA9GMvWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "14882ca0-6003-00ea-1b88-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages?numofmessages=1&visibilitytimeout=30",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724936-4003-00b9-3103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>70decbfa-af3b-453f-b291-f78c97eb512d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA8psVawNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:20:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14882cb8-6003-00ea-2e88-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages/70decbfa-af3b-453f-b291-f78c97eb512d?popreceipt=AgAAAAMAAAAAAAAA8psVawNH1QE%3d",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&include=metadata&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724958-4003-00b9-5103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882ccc-6003-00ea-4188-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceapitestslistqueues2335005ecce17d3f5b0</Name><Metadata><metadata0>value0</metadata0></Metadata></Queue><Queue><Name>queueserviceapitestslistqueues2335005ecce17d3f5b1</Name><Metadata><metadata1>value1</metadata1></Metadata></Queue><Queue><Name>queueserviceapitestslistqueues2335005ecce17d3f5b2</Name><Metadata><metadata2>value2</metadata2></Metadata></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355?comp=metadata",
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724972-4003-00b9-6a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "StatusCode" : "204",
+      "x-ms-request-id" : "14882cde-6003-00ea-5388-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -100,15 +95,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "80724985-4003-00b9-7d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "x-ms-request-id" : "14882cee-6003-00ea-6288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -116,9 +111,9 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8072499e-4003-00b9-1603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "x-ms-request-id" : "14882cfe-6003-00ea-7288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   } ],
-  "variables" : [ "queue60865355" ]
+  "variables" : [ "queueserviceapitestslistqueues2335005ecce17d3f5b" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateNull.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateNull.json
new file mode 100644
index 000000000000..ba5f37f8f855
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateNull.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueue.json
new file mode 100644
index 000000000000..2517bb6c4f49
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueue.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeue80797d675f4fdd",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14882f05-6003-00ea-5588-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:48 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeue80797d675f4fdd/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14882f2e-6003-00ea-7c88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>91d64df6-7e14-4818-b5ec-d683d139d7d4</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:49 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:49 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAqpkVMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:49 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeue80797d675f4fdd" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload0.json
new file mode 100644
index 000000000000..d5184d25f637
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload0.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload0158269f3",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14883095-6003-00ea-5288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload0158269f3/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "148830a8-6003-00ea-6488-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2b6edef0-dc13-4d4a-86af-0aa1795df7f5</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:50 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:50 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAASo6vMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:50 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuemaxoverload0158269f3" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload1.json
new file mode 100644
index 000000000000..8f5a34864625
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload175671399",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "148830ec-6003-00ea-2788-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload175671399/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "148830ff-6003-00ea-3788-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>c0593110-94aa-4206-a6e1-07656271f3f1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:51 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:51 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAkfrJMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuemaxoverload175671399" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload2.json
new file mode 100644
index 000000000000..067dc1c69797
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload256562926",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "1488313b-6003-00ea-7088-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload256562926/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14883153-6003-00ea-0688-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>baa9aa21-4efe-4c65-aac3-a891899c6c3b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:51 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:51 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbcrjMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuemaxoverload256562926" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidMetadata.json
new file mode 100644
index 000000000000..eec802198892
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidMetadata.json
@@ -0,0 +1,21 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuewithinvalidmetadata80018",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "Connection" : "close",
+      "retry-after" : "0",
+      "Content-Length" : "339",
+      "StatusCode" : "400",
+      "Body" : "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\"http://www.w3.org/TR/html4/strict.dtd\">\r\n<HTML><HEAD><TITLE>Bad Request</TITLE>\r\n<META HTTP-EQUIV=\"Content-Type\" Content=\"text/html; charset=us-ascii\"></HEAD>\r\n<BODY><h2>Bad Request - Invalid Header</h2>\r\n<hr><p>HTTP Error 400. The request has an invalid header name.</p>\r\n</BODY></HTML>\r\n",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "text/html; charset=us-ascii"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuewithinvalidmetadata80018" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName0.json
new file mode 100644
index 000000000000..e37d99fa4008
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName0.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a_b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14882fb9-6003-00ea-7f88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14882fb9-6003-00ea-7f88-53cf77000000\nTime:2019-08-15T16:40:50.2152332Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName1.json
new file mode 100644
index 000000000000..ae1b42f193e9
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName1.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/-ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14882fd5-6003-00ea-1888-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14882fd5-6003-00ea-1888-53cf77000000\nTime:2019-08-15T16:40:50.2873012Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName2.json
new file mode 100644
index 000000000000..9e2488e28e65
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName2.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a--b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14882fed-6003-00ea-2f88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14882fed-6003-00ea-2f88-53cf77000000\nTime:2019-08-15T16:40:50.3633721Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName3.json
new file mode 100644
index 000000000000..8e94c068e5c7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName3.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/Abc",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14883007-6003-00ea-4888-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14883007-6003-00ea-4888-53cf77000000\nTime:2019-08-15T16:40:50.4464512Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName4.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName4.json
new file mode 100644
index 000000000000..6fc511f8d939
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName4.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "1488302b-6003-00ea-6a88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:1488302b-6003-00ea-6a88-53cf77000000\nTime:2019-08-15T16:40:50.5385381Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName5.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName5.json
new file mode 100644
index 000000000000..5ecbd0458ed2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName5.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/verylongverylongverylongverylongverylongverylongverylongverylong",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14883049-6003-00ea-0788-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:14883049-6003-00ea-0788-53cf77000000\nTime:2019-08-15T16:40:50.6326265Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueue.json
new file mode 100644
index 000000000000..7a9abf6186ac
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueue.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestsdeletequeue62103c4b54ee98",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cbb0-2003-0008-0788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestsdeletequeue62103c4b54ee98",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "b9c9cbbb-2003-0008-1188-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestsdeletequeue62103c4b54ee98/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "b9c9cbc3-2003-0008-1888-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9cbc3-2003-0008-1888-532b05000000\nTime:2019-08-15T16:40:51.4946206Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestsdeletequeue62103c4b54ee98" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSASToken.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueueError.json
similarity index 68%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSASToken.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueueError.json
index 06af19821b53..a07d9d72098a 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSASToken.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueueError.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue95805f24/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/5686b8e172374fd8",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,11 +13,11 @@
       "retry-after" : "0",
       "Content-Length" : "217",
       "StatusCode" : "404",
-      "x-ms-request-id" : "8071d154-4003-00b9-2803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d154-4003-00b9-2803-47d378000000\nTime:2019-07-30T18:19:02.4945662Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "b9c9cbcf-2003-0008-2388-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9cbcf-2003-0008-2388-532b05000000\nTime:2019-08-15T16:40:51.5867065Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue95805f24" ]
+  "variables" : [ "5686b8e172374fd8" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetAndSetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetAndSetProperties.json
new file mode 100644
index 000000000000..47c703d98b5f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetAndSetProperties.json
@@ -0,0 +1,59 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9ccbc-2003-0008-6b88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-id" : "b9c9ccc0-2003-0008-6f88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:55 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cf1c-2003-0008-7788-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:56 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetQueueClient.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetQueueClient.json
new file mode 100644
index 000000000000..a9126688e816
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetQueueClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ "queueserviceasyncapitestsgetqueueclient2398679f4afbe" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListEmptyQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListEmptyQueues.json
new file mode 100644
index 000000000000..ba5f37f8f855
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListEmptyQueues.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExistingQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues0.json
similarity index 57%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExistingQueue.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues0.json
index d711d370bf2b..2c54e0279c11 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExistingQueue.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues0.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue520260d0",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues009680da03558a90",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,51 +12,47 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8083-e003-0073-6a09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:01 GMT"
+      "x-ms-request-id" : "b9c9cbdd-2003-0008-3088-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue520260d0",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues009680da03558a91",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8163-e003-0073-3009-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cbe6-2003-0008-3788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue520260d0/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues009680da03558a92",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
       "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "1cdd8174-e003-0073-4009-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:1cdd8174-e003-0073-4009-4740b5000000\nTime:2019-07-30T19:01:03.1630238Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cbf2-2003-0008-3f88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue520260d0&include=&comp=list",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -65,11 +61,11 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd817e-e003-0073-4809-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue520260d0</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
+      "x-ms-request-id" : "b9c9cbfa-2003-0008-4688-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceasyncapitestslistqueues009680da03558a90</Name></Queue><Queue><Name>queueserviceasyncapitestslistqueues009680da03558a91</Name></Queue><Queue><Name>queueserviceasyncapitestslistqueues009680da03558a92</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue520260d0" ]
+  "variables" : [ "queueserviceasyncapitestslistqueues009680da03558a9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues1.json
similarity index 50%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueue.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues1.json
index 6ace1ebfcc3d..e1af0b2334f9 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueue.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues104635a5e67dfac0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,79 +12,79 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd818b-e003-0073-5309-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT"
+      "x-ms-request-id" : "b9c9cc1f-2003-0008-6888-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues104635a5e67dfac1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
+      "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd818f-e003-0073-5609-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0f84abde-fb8c-4049-b6de-4e353f4af767</MessageId><InsertionTime>Tue, 30 Jul 2019 19:01:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 19:01:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAnQ1cIglH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 19:01:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "b9c9cc2b-2003-0008-7188-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue41192d54&include=&comp=list",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues104635a5e67dfac2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8195-e003-0073-5b09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue41192d54</Prefix><Queues><Queue><Name>queue41192d54</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cc33-2003-0008-7788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54/messages",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8199-e003-0073-5f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cc4e-2003-0008-0d88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceasyncapitestslistqueues104635a5e67dfac0</Name></Queue><Queue><Name>queueserviceasyncapitestslistqueues104635a5e67dfac1</Name></Queue></Queues><NextMarker>/azstoragesdkaccount/queueserviceasyncapitestslistqueues104635a5e67dfac2</NextMarker></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&marker=/azstoragesdkaccount/queueserviceasyncapitestslistqueues104635a5e67dfac2&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd81bb-e003-0073-7c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cc55-2003-0008-1488-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><Marker>/azstoragesdkaccount/queueserviceasyncapitestslistqueues104635a5e67dfac2</Marker><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceasyncapitestslistqueues104635a5e67dfac2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue41192d54" ]
+  "variables" : [ "queueserviceasyncapitestslistqueues104635a5e67dfac" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueWithMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues2.json
similarity index 51%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueWithMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues2.json
index a884a0d89d21..f42927acdd60 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueWithMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues2.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues25858399726d6ba0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,80 +12,60 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd81fa-e003-0073-3209-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:04 GMT"
+      "x-ms-request-id" : "b9c9cc71-2003-0008-2e88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab?comp=metadata",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues25858399726d6ba1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd824c-e003-0073-7709-4740b5000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 19:01:04 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue84974cab&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8258-e003-0073-0209-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue84974cab</Prefix><Queues><Queue><Name>queue84974cab</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
-      "Content-Type" : "application/xml"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cc77-2003-0008-3188-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues25858399726d6ba2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8260-e003-0073-0a09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cc86-2003-0008-3e88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&include=metadata&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8267-e003-0073-1109-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cc8c-2003-0008-4388-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceasyncapitestslistqueues25858399726d6ba0</Name><Metadata><metadata0>value0</metadata0></Metadata></Queue><Queue><Name>queueserviceasyncapitestslistqueues25858399726d6ba1</Name><Metadata><metadata1>value1</metadata1></Metadata></Queue><Queue><Name>queueserviceasyncapitestslistqueues25858399726d6ba2</Name><Metadata><metadata2>value2</metadata2></Metadata></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue84974cab" ]
+  "variables" : [ "queueserviceasyncapitestslistqueues25858399726d6ba" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json
deleted file mode 100644
index d5ff4fab7281..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue95540dc6/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071dd7c-4003-00b9-4f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071dd7c-4003-00b9-4f03-47d378000000\nTime:2019-07-30T18:19:06.4682531Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue95540dc6/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071dd94-4003-00b9-6603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071dd94-4003-00b9-6603-47d378000000\nTime:2019-07-30T18:19:06.4982809Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue95540dc6" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json
deleted file mode 100644
index 104f97276190..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd82fd-e003-0073-1609-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueAlreadyExists",
-      "retry-after" : "0",
-      "Content-Length" : "222",
-      "StatusCode" : "409",
-      "x-ms-request-id" : "1cdd8301-e003-0073-1909-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueAlreadyExists</Code><Message>The specified queue already exists.\nRequestId:1cdd8301-e003-0073-1909-4740b5000000\nTime:2019-07-30T19:01:07.1007793Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue88691a05&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd830a-e003-0073-2009-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue88691a05</Prefix><Queues><Queue><Name>queue88691a05</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd830e-e003-0073-2409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8317-e003-0073-2d09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue88691a05" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExisting.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExisting.json
deleted file mode 100644
index 326bd01d83b8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExisting.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071de75-4003-00b9-4103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dea3-4003-00b9-6e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>30cc479a-af92-4451-8a41-8413a8f9c095</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAFWldRgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071debe-4003-00b9-0903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724410-4003-00b9-3903-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724410-4003-00b9-3903-47d378000000\nTime:2019-07-30T18:19:36.9024744Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724439-4003-00b9-6003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724439-4003-00b9-6003-47d378000000\nTime:2019-07-30T18:19:36.9335030Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue11519005" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json
deleted file mode 100644
index 02698922bb52..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bd76-4003-00b9-5603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bda8-4003-00b9-0603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6c6a6f5b-e93c-4712-a9e6-9d882ef2725d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAJ00nQANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:56 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071bdd6-4003-00b9-3403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6c6a6f5b-e93c-4712-a9e6-9d882ef2725d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAb4EPUgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:26 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages/6c6a6f5b-e93c-4712-a9e6-9d882ef2725drandom?popreceipt=AgAAAAMAAAAAAAAAb4EPUgNH1QE%3d",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "MessageNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "221",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071be01-4003-00b9-5f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:8071be01-4003-00b9-5f03-47d378000000\nTime:2019-07-30T18:18:56.4930009Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071be28-4003-00b9-0603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071be47-4003-00b9-2403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  } ],
-  "variables" : [ "queue5582925f" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json
deleted file mode 100644
index 875c4a238ffb..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bc63-4003-00b9-4d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bc9c-4003-00b9-0403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>9a59b835-0fa6-4bcb-8094-61e61a4120c2</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAGXD/PwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:56 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071bcc5-4003-00b9-2b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>9a59b835-0fa6-4bcb-8094-61e61a4120c2</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAb6TnUQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:26 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages/9a59b835-0fa6-4bcb-8094-61e61a4120c2?popreceipt=AgAAAAMAAAAAAAAAb6TnUQNH1QE%3drandom",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "444",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071bcf4-4003-00b9-5803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:8071bcf4-4003-00b9-5803-47d378000000\nTime:2019-07-30T18:18:56.2297573Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAb6TnUQNH1QE=random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bd1d-4003-00b9-7e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bd3c-4003-00b9-1c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  } ],
-  "variables" : [ "queue76680d09" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json
deleted file mode 100644
index 287a17ccf8f1..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5543243d/messages/invalid?popreceipt=call",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724c3c-4003-00b9-2003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724c3c-4003-00b9-2003-47d378000000\nTime:2019-07-30T18:19:39.3217165Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5543243d/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724c62-4003-00b9-4503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724c62-4003-00b9-4503-47d378000000\nTime:2019-07-30T18:19:39.3547455Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue5543243d" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMetadata.json
deleted file mode 100644
index 705c7722d081..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMetadata.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724d57-4003-00b9-3403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724d80-4003-00b9-5a03-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724d98-4003-00b9-7203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724db1-4003-00b9-0b03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724dd4-4003-00b9-2d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724dec-4003-00b9-4503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  } ],
-  "variables" : [ "queue743794d9" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistent.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistent.json
deleted file mode 100644
index 525cc82bc6b9..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistent.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue784292a2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724806-4003-00b9-0b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724806-4003-00b9-0b03-47d378000000\nTime:2019-07-30T18:19:38.1306132Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue784292a2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724826-4003-00b9-2a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724826-4003-00b9-2a03-47d378000000\nTime:2019-07-30T18:19:38.1606401Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue784292a2" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistentQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistentQueue.json
deleted file mode 100644
index 2e67336c2204..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistentQueue.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5883546e",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "1cdd8355-e003-0073-6209-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:1cdd8355-e003-0073-6209-4740b5000000\nTime:2019-07-30T19:01:07.7774261Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue5883546e&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8359-e003-0073-6609-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue5883546e</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue5883546e" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMultipleMessages.json
deleted file mode 100644
index aacfeda6c1d6..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMultipleMessages.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724a13-4003-00b9-0803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724a33-4003-00b9-2703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>be3d48d4-b018-40ad-85a7-d426fb4d785f</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAA2tgWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724a57-4003-00b9-4a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f39387d0-8ac4-4739-80a3-a1e1f8d118df</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAANU5lWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages?numofmessages=2&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724a74-4003-00b9-6603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>be3d48d4-b018-40ad-85a7-d426fb4d785f</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeftLawNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:20:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage><QueueMessage><MessageId>f39387d0-8ac4-4739-80a3-a1e1f8d118df</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeftLawNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:20:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724a8f-4003-00b9-7e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724aa5-4003-00b9-1403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  } ],
-  "variables" : [ "queue41164c5f" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json
deleted file mode 100644
index c92f5ac1b9fb..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue03640269/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "807247b8-4003-00b9-4003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807247b8-4003-00b9-4003-47d378000000\nTime:2019-07-30T18:19:38.0495370Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue03640269/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "807247d2-4003-00b9-5803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807247d2-4003-00b9-5803-47d378000000\nTime:2019-07-30T18:19:38.0825673Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue03640269" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueTooManyMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueTooManyMessages.json
deleted file mode 100644
index c1216be98ccd..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueTooManyMessages.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071cf82-4003-00b9-6203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725/messages?numofmessages=64&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "456",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071cfa7-4003-00b9-0503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:8071cfa7-4003-00b9-0503-47d378000000\nTime:2019-07-30T18:19:01.9911001Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>64</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cfc0-4003-00b9-1d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cfe1-4003-00b9-3d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  } ],
-  "variables" : [ "queue33803725" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueEmptyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueEmptyMessage.json
deleted file mode 100644
index 015e74ada642..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueEmptyMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724adb-4003-00b9-4903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724b04-4003-00b9-7103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f1339f74-d98e-4e9c-bfb7-b53cda993323</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAApySGWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724b26-4003-00b9-1303-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f1339f74-d98e-4e9c-bfb7-b53cda993323</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText /></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724b3f-4003-00b9-2c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724b51-4003-00b9-3e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  } ],
-  "variables" : [ "queue85000300" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueMessage.json
deleted file mode 100644
index 4be6f36d26c0..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d362-4003-00b9-1a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d37c-4003-00b9-3203-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f39a6db5-cb4a-4f70-be21-c72803c0253e</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAV6QtRANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071d393-4003-00b9-4903-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f39a6db5-cb4a-4f70-be21-c72803c0253e</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d3a6-4003-00b9-5c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d3b4-4003-00b9-6a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  } ],
-  "variables" : [ "queue857326bc" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json
deleted file mode 100644
index 9859c91ffdb1..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue50657bc8/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071d2c1-4003-00b9-8003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d2c1-4003-00b9-8003-47d378000000\nTime:2019-07-30T18:19:02.9379772Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue50657bc8/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071d2ea-4003-00b9-2703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d2ea-4003-00b9-2703-47d378000000\nTime:2019-07-30T18:19:02.9770131Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue50657bc8" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json
deleted file mode 100644
index 5c546664731c..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071be6d-4003-00b9-4a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f/messages?visibilitytimeout=0&messagettl=2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071be9d-4003-00b9-7603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f2a72af5-11f7-4174-9bca-0c6bbc7a1a4f</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 30 Jul 2019 18:18:58 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAl7hMQANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:56 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071cea8-4003-00b9-0e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList />",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cec0-4003-00b9-2603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cee0-4003-00b9-4603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  } ],
-  "variables" : [ "queue4952015f" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json
deleted file mode 100644
index f51ee48724c7..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue066060ee?comp=acl",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8072468c-4003-00b9-2603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8072468c-4003-00b9-2603-47d378000000\nTime:2019-07-30T18:19:37.6481654Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue066060ee/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "807246a7-4003-00b9-3f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807246a7-4003-00b9-3f03-47d378000000\nTime:2019-07-30T18:19:37.6781928Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue066060ee" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json
deleted file mode 100644
index c81fadfa36f6..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue89138457?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071cf1e-4003-00b9-0203-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071cf1e-4003-00b9-0203-47d378000000\nTime:2019-07-30T18:19:01.8439650Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue89138457/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071cf3f-4003-00b9-2103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071cf3f-4003-00b9-2103-47d378000000\nTime:2019-07-30T18:19:01.8769939Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue89138457" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json
deleted file mode 100644
index 0f91979ead55..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue881089d3/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "1cdd82f3-e003-0073-0f09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:1cdd82f3-e003-0073-0f09-4740b5000000\nTime:2019-07-30T19:01:06.9836664Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue881089d3&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd82f9-e003-0073-1409-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue881089d3</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue881089d3" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesIncludeMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesIncludeMetadata.json
deleted file mode 100644
index a3a8affdfea0..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesIncludeMetadata.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8362-e003-0073-6e09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8373-e003-0073-7b09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8378-e003-0073-7f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue3555933b&include=metadata&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd837b-e003-0073-0109-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue3555933b</Prefix><Queues><Queue><Name>queue3555933b0</Name><Metadata><metadata1>value1</metadata1><metadata2>value2</metadata2></Metadata></Queue><Queue><Name>queue3555933b1</Name><Metadata /></Queue><Queue><Name>queue3555933b2</Name><Metadata><metadata1>value1</metadata1><metadata2>value2</metadata2></Metadata></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue3555933b&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8382-e003-0073-0409-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue3555933b</Prefix><Queues><Queue><Name>queue3555933b0</Name></Queue><Queue><Name>queue3555933b1</Name></Queue><Queue><Name>queue3555933b2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b0/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd838a-e003-0073-0a09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd838d-e003-0073-0d09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b1/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8395-e003-0073-1409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd839b-e003-0073-1909-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd83a1-e003-0073-1f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd83a4-e003-0073-2209-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  } ],
-  "variables" : [ "queue3555933b" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithLimit.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithLimit.json
deleted file mode 100644
index fc87bcea2c77..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithLimit.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e780",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "4ab9e4e1-4003-00df-40f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e781",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "4ab9e592-4003-00df-55f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e782",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "4ab9e59c-4003-00df-5df2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue20354e78&maxresults=2&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "4ab9e5a9-4003-00df-66f2-4b6122000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue20354e78</Prefix><MaxResults>2</MaxResults><Queues><Queue><Name>queue20354e780</Name></Queue><Queue><Name>queue20354e781</Name></Queue></Queues><NextMarker>/azstoragesdkaccount/queue20354e782</NextMarker></EnumerationResults>",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue20354e78&marker=/azstoragesdkaccount/queue20354e782&maxresults=2&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "4ab9e5b3-4003-00df-6ff2-4b6122000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue20354e78</Prefix><Marker>/azstoragesdkaccount/queue20354e782</Marker><MaxResults>2</MaxResults><Queues><Queue><Name>queue20354e782</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue20354e78&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "4ab9e5b5-4003-00df-71f2-4b6122000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue20354e78</Prefix><Queues><Queue><Name>queue20354e780</Name></Queue><Queue><Name>queue20354e781</Name></Queue><Queue><Name>queue20354e782</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e780/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5bb-4003-00df-76f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e780",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5bd-4003-00df-78f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e781/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5d7-4003-00df-0df2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e781",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5d9-4003-00df-0ff2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e782/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5df-4003-00df-13f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e782",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5e4-4003-00df-17f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  } ],
-  "variables" : [ "queue20354e78" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithPrefix.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithPrefix.json
deleted file mode 100644
index 25ab0025e774..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithPrefix.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8322-e003-0073-3709-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b51",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8329-e003-0073-3c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8330-e003-0073-4109-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue360442b5prefix&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8334-e003-0073-4409-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue360442b5prefix</Prefix><Queues><Queue><Name>queue360442b5prefix0</Name></Queue><Queue><Name>queue360442b5prefix2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue360442b5&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8337-e003-0073-4709-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue360442b5</Prefix><Queues><Queue><Name>queue360442b51</Name></Queue><Queue><Name>queue360442b5prefix0</Name></Queue><Queue><Name>queue360442b5prefix2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b51/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8339-e003-0073-4909-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b51",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd833c-e003-0073-4c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix0/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd833f-e003-0073-4e09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8343-e003-0073-5209-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8345-e003-0073-5409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8349-e003-0073-5709-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue360442b5" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMessage.json
deleted file mode 100644
index dd793491431d..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724592-4003-00b9-3103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "807245b2-4003-00b9-5003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4af8da31-fef8-48bb-9c58-e31cb39648bc</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:37 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAY9qQWANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "807245d1-4003-00b9-6f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4af8da31-fef8-48bb-9c58-e31cb39648bc</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:37 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807245e5-4003-00b9-0303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807245f8-4003-00b9-1603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  } ],
-  "variables" : [ "queue9289930b" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMultipleMessages.json
deleted file mode 100644
index ec67bb0d5044..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMultipleMessages.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d3de-4003-00b9-1203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d3fe-4003-00b9-3103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>eb154178-fd28-4e7d-9bb4-502bd3aa9472</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAZNBKRANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d435-4003-00b9-6503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>c2697011-4b18-4aae-b894-92e681fe9af3</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAEZNWRANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages?numofmessages=2&peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071d45c-4003-00b9-0b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>eb154178-fd28-4e7d-9bb4-502bd3aa9472</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage><QueueMessage><MessageId>c2697011-4b18-4aae-b894-92e681fe9af3</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d478-4003-00b9-2703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d495-4003-00b9-4303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  } ],
-  "variables" : [ "queue17331e05" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekQueueDoesNotExist.json
deleted file mode 100644
index 5efe773a0a36..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue163539f6/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071bbf5-4003-00b9-6403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071bbf5-4003-00b9-6403-47d378000000\nTime:2019-07-30T18:18:55.9785249Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue163539f6/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071bc16-4003-00b9-0303-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071bc16-4003-00b9-0303-47d378000000\nTime:2019-07-30T18:18:56.0175608Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue163539f6" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekTooManyMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekTooManyMessages.json
deleted file mode 100644
index 0e21d3f3e056..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekTooManyMessages.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724850-4003-00b9-5203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2/messages?numofmessages=64&peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "456",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8072486a-4003-00b9-6b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:8072486a-4003-00b9-6b03-47d378000000\nTime:2019-07-30T18:19:38.2327064Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>64</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724884-4003-00b9-0503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807248a6-4003-00b9-2603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  } ],
-  "variables" : [ "queue007623b2" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidAccessPolicy.json
deleted file mode 100644
index c053664720a1..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidAccessPolicy.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724b93-4003-00b9-7c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0?comp=acl",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidXmlDocument",
-      "retry-after" : "0",
-      "Content-Length" : "371",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "80724bb2-4003-00b9-1a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:80724bb2-4003-00b9-1a03-47d378000000\nTime:2019-07-30T18:19:39.1915951Z</Message><LineNumber>1</LineNumber><LinePosition>304</LinePosition><Reason>Signed identifier ID cannot be empty or over 64 characters in length</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724bde-4003-00b9-4503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724bf9-4003-00b9-6003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  } ],
-  "variables" : [ "queue598515b0" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidMetadata.json
deleted file mode 100644
index 5e4a36f56436..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidMetadata.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d01e-4003-00b9-7903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "EmptyMetadataKey",
-      "retry-after" : "0",
-      "Content-Length" : "285",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071d048-4003-00b9-2003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:8071d048-4003-00b9-2003-47d378000000\nTime:2019-07-30T18:19:02.1712670Z</Message><MetadataValue>bad metadata</MetadataValue></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d05e-4003-00b9-3603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d078-4003-00b9-5003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  } ],
-  "variables" : [ "queue04921afb" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadata.json
deleted file mode 100644
index 4f5b33d48612..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadata.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724c9b-4003-00b9-7c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724cc8-4003-00b9-2803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724ce7-4003-00b9-4503-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724d0c-4003-00b9-6903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724d24-4003-00b9-0103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  } ],
-  "variables" : [ "queue228395ba" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json
deleted file mode 100644
index 2403d75b3cd8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue1023979b?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724760-4003-00b9-7003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724760-4003-00b9-7003-47d378000000\nTime:2019-07-30T18:19:37.9564505Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue1023979b/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8072477f-4003-00b9-0d03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8072477f-4003-00b9-0d03-47d378000000\nTime:2019-07-30T18:19:37.9904825Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue1023979b" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setProperties.json
deleted file mode 100644
index 6788bd49edd8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setProperties.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81c0-e003-0073-8009-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1cdd81d5-e003-0073-1309-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81e5-e003-0073-1d09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1cdd81eb-e003-0073-2309-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81ed-e003-0073-2509-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue30084080&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81f3-e003-0073-2b09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue30084080</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue30084080" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setTooManyAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setTooManyAccessPolicies.json
deleted file mode 100644
index 52ffab91ef1e..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setTooManyAccessPolicies.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724626-4003-00b9-4103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a?comp=acl",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidXmlDocument",
-      "retry-after" : "0",
-      "Content-Length" : "294",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "80724645-4003-00b9-5f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:80724645-4003-00b9-5f03-47d378000000\nTime:2019-07-30T18:19:37.5430678Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8072465c-4003-00b9-7603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724670-4003-00b9-0a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  } ],
-  "variables" : [ "queue02682f2a" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidMessageId.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidMessageId.json
deleted file mode 100644
index 849ea36b90c2..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidMessageId.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dc01-4003-00b9-6903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dc22-4003-00b9-0703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2d1bf643-019d-41da-8a3e-635dba5df867</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAtDTwRQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071dc41-4003-00b9-2503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2d1bf643-019d-41da-8a3e-635dba5df867</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA6kHYVwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:36 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages/2d1bf643-019d-41da-8a3e-635dba5df867random?popreceipt=AgAAAAMAAAAAAAAA6kHYVwNH1QE%3d&visibilitytimeout=1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "MessageNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "221",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071dc6d-4003-00b9-5003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:8071dc6d-4003-00b9-5003-47d378000000\nTime:2019-07-30T18:19:06.1889942Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dc88-4003-00b9-6b03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dca6-4003-00b9-0803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue70821c12" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json
deleted file mode 100644
index 960abdc79ba2..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071ddb6-4003-00b9-0603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dddf-4003-00b9-2d03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>af0f96cb-a19e-4f9a-b1ba-08e6c27944db</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAzks4RgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071ddf9-4003-00b9-4703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>af0f96cb-a19e-4f9a-b1ba-08e6c27944db</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA5KoeWANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:36 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages/af0f96cb-a19e-4f9a-b1ba-08e6c27944db?popreceipt=AgAAAAMAAAAAAAAA5KoeWANH1QE%3drandom&visibilitytimeout=1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "444",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071de13-4003-00b9-6103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:8071de13-4003-00b9-6103-47d378000000\nTime:2019-07-30T18:19:06.6474193Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAA5KoeWANH1QE=random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071de2b-4003-00b9-7803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071de43-4003-00b9-1003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue12446d02" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json
deleted file mode 100644
index b87cef21fed8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue960895d5/messages/doesn't?popreceipt=exist&visibilitytimeout=5",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "415",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071d32f-4003-00b9-6803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:8071d32f-4003-00b9-6803-47d378000000\nTime:2019-07-30T18:19:03.0460773Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>exist</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue960895d5/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071d341-4003-00b9-7a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d341-4003-00b9-7a03-47d378000000\nTime:2019-07-30T18:19:03.0771058Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue960895d5" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/swagger/README.md b/sdk/storage/azure-storage-queue/swagger/README.md
new file mode 100644
index 000000000000..c3d45d9acacc
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/swagger/README.md
@@ -0,0 +1,175 @@
+# Azure Queue Storage for Java
+
+> see https://aka.ms/autorest
+
+### Setup
+```ps
+cd C:\work
+git clone --recursive https://github.com/Azure/autorest.java/
+cd autorest.java
+git checkout v3
+npm install
+cd ..
+git clone --recursive https://github.com/jianghaolu/autorest.modeler/
+cd autorest.modeler
+git checkout headerprefixfix
+npm install
+```
+
+### Generation
+```ps
+cd <swagger-folder>
+autorest --use=C:/work/autorest.java --use=C:/work/autorest.modeler --version=2.0.4280
+```
+
+### Code generation settings
+``` yaml
+input-file: ./queue-2018-03-28.json
+java: true
+output-folder: ../
+namespace: com.azure.storage.queue
+enable-xml: true
+generate-client-interfaces: false
+sync-methods: none
+license-header: MICROSOFT_MIT_SMALL
+add-context-parameter: true
+```
+
+### /{queueName}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}?comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}?comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}?comp=acl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}?comp=acl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}"]
+  transform: >
+    let param = $.post.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.post.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages?peekonly=true
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages?peekonly=true"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const queueNamePath = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        const messageIdPath = param["$ref"].replace(/[#].*$/, "#/parameters/MessageId");
+        $.put.parameters.splice(0, 0, { "$ref": queueNamePath });
+        $.put.parameters.splice(1, 0, { "$ref": messageIdPath });
+    }
+```
+
+### /{queueName}/messages/{messageid}?popreceipt={popReceipt}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages/{messageid}?popreceipt={popReceipt}"]
+  transform: >
+    let param = $.delete.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const queueNamePath = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        const messageIdPath = param["$ref"].replace(/[#].*$/, "#/parameters/MessageId");
+        $.delete.parameters.splice(0, 0, { "$ref": queueNamePath });
+        $.delete.parameters.splice(1, 0, { "$ref": messageIdPath });
+    }
+```
+
+### Rename MessageItems
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions
+  transform: >
+    if (!$.DequeuedMessage) {
+        $.DequeuedMessage = $.DequeuedMessageItem;
+        delete $.DequeuedMessageItem;
+        $.DequeuedMessagesList.items.$ref = $.DequeuedMessagesList.items.$ref.replace("DequeuedMessageItem", "DequeuedMessage");
+    }
+    if (!$.PeekedMessage) {
+        $.PeekedMessage = $.PeekedMessageItem;
+        delete $.PeekedMessageItem;
+        $.PeekedMessagesList.items.$ref = $.PeekedMessagesList.items.$ref.replace("PeekedMessageItem", "PeekedMessage");
+    }
+```
+
+### MessageId
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.MessageId
+  transform: >
+    $.description = "The message ID name.";
+```
diff --git a/sdk/storage/azure-storage-queue/swagger/queue-2018-03-28.json b/sdk/storage/azure-storage-queue/swagger/queue-2018-03-28.json
new file mode 100644
index 000000000000..49ca3244ed16
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/swagger/queue-2018-03-28.json
@@ -0,0 +1,1856 @@
+{
+    "swagger": "2.0",
+    "info": {
+      "title": "Azure Queue Storage",
+      "version": "2018-03-28",
+      "x-ms-code-generation-settings": {
+        "header": "MIT",
+        "strictSpecAdherence": false
+      }
+    },
+    "x-ms-parameterized-host": {
+      "hostTemplate": "{url}",
+      "useSchemePrefix": false,
+      "positionInOperation": "first",
+      "parameters": [
+        {
+          "$ref": "#/parameters/Url"
+        }
+      ]
+    },
+    "securityDefinitions": {
+      "queue_shared_key": {
+        "type": "apiKey",
+        "name": "Authorization",
+        "in": "header"
+      }
+    },
+    "schemes": [
+      "https"
+    ],
+    "consumes": [
+      "application/xml"
+    ],
+    "produces": [
+      "application/xml"
+    ],
+    "paths": {},
+    "x-ms-paths": {
+      "/?restype=service&comp=properties": {
+        "put": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_SetProperties",
+          "description": "Sets properties for a storage account's Queue service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
+          "parameters": [
+            {
+              "$ref": "#/parameters/StorageServiceProperties"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "Success (Accepted)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetProperties",
+          "description": "gets the properties of a storage account's Queue service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceProperties"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/?restype=service&comp=stats": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetStatistics",
+          "description": "Retrieves statistics related to replication for the Queue service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceStats"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "stats"
+            ]
+          }
+        ]
+      },
+      "/?comp=list": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_ListQueuesSegment",
+          "description": "The List Queues Segment operation returns a list of the queues under the specified account",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListQueuesInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListQueuesSegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/{queueName}": {
+        "put": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Queue_Create",
+          "description": "creates a new queue under the given account.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "Success, queue created.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "204": {
+              "description": "Success, queue created.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_Delete",
+          "description": "operation permanently deletes the specified queue",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}?comp=metadata": {
+        "get": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_GetProperties",
+          "description": "Retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated with the queue as name-values pairs.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "x-ms-approximate-messages-count": {
+                  "type": "integer",
+                  "x-ms-client-name": "ApproximateMessagesCount",
+                  "description": "The approximate number of messages in the queue. This number is not lower than the actual number of messages in the queue, but could be higher."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "put": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_SetMetadata",
+          "description": "sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "metadata"
+            ]
+          }
+        ]
+      },
+      "/{queueName}?comp=acl": {
+        "get": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_GetAccessPolicy",
+          "description": "returns details about any stored access policies specified on the queue that may be used with Shared Access Signatures.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/SignedIdentifiers"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "put": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_SetAccessPolicy",
+          "description": "sets stored access policies for the queue that may be used with Shared Access Signatures",
+          "parameters": [
+            {
+              "$ref": "#/parameters/QueueAcl"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acl"
+            ]
+          }
+        ]
+      },
+      "/{queueName}/messages": {
+        "get": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Dequeue",
+          "description": "The Dequeue operation retrieves one or more messages from the front of the queue.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/NumOfMessages"
+            },
+            {
+              "$ref": "#/parameters/VisibilityTimeout"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "OK",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/DequeuedMessagesList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Clear",
+          "description": "The Clear operation deletes all messages from the specified queue.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}": {
+        "post": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Enqueue",
+          "description": "The Enqueue operation adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request with UTF-8 encoding. The encoded message can be up to 64 KB in size for versions 2011-08-18 and newer, or 8 KB in size for previous versions.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/QueueMessage"
+            },
+            {
+              "$ref": "#/parameters/VisibilityTimeout"
+            },
+            {
+              "$ref": "#/parameters/MessageTTL"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "Created",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/EnqueuedMessageList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}/messages?peekonly=true": {
+        "get": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Peek",
+          "description": "The Peek operation retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/NumOfMessages"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "OK",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/PeekedMessagesList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "peekonly",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "true"
+            ]
+          }
+        ]
+      },
+      "/{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}": {
+        "put": {
+          "tags": [
+            "messageId"
+          ],
+          "operationId": "MessageId_Update",
+          "description": "The Update operation was introduced with version 2011-08-18 of the Queue service API. The Update Message operation updates the visibility timeout of a message. You can also use this operation to update the contents of a message. A message must be in a format that can be included in an XML request with UTF-8 encoding, and the encoded message can be up to 64KB in size.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/QueueMessage"
+            },
+            {
+              "$ref": "#/parameters/PopReceipt"
+            },
+            {
+              "$ref": "#/parameters/VisibilityTimeoutRequired"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-popreceipt": {
+                  "x-ms-client-name": "PopReceipt",
+                  "type": "string",
+                  "description": "The pop receipt of the queue message."
+                },
+                "x-ms-time-next-visible": {
+                  "x-ms-client-name": "TimeNextVisible",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "A UTC date/time value that represents when the message will be visible on the queue."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}/messages/{messageid}?popreceipt={popReceipt}": {
+        "delete": {
+          "tags": [
+            "messageId"
+          ],
+          "operationId": "MessageId_Delete",
+          "description": "The Delete operation deletes the specified message.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/PopReceipt"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      }
+    },
+    "definitions": {
+      "AccessPolicy": {
+        "type": "object",
+        "required": [
+          "Start",
+          "Expiry",
+          "Permission"
+        ],
+        "description": "An Access policy",
+        "properties": {
+          "Start": {
+            "description": "the date-time the policy is active",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Expiry": {
+            "description": "the date-time the policy expires",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Permission": {
+            "description": "the permissions for the acl policy",
+            "type": "string"
+          }
+        }
+      },
+      "ListQueuesSegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "The object returned when calling List Queues on a Queue Service.",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "Prefix",
+          "MaxResults",
+          "NextMarker"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "QueueItems": {
+            "xml": {
+              "wrapped": true,
+              "name": "Queues"
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/QueueItem"
+            }
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "CorsRule": {
+        "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
+        "type": "object",
+        "required": [
+          "AllowedOrigins",
+          "AllowedMethods",
+          "AllowedHeaders",
+          "ExposedHeaders",
+          "MaxAgeInSeconds"
+        ],
+        "properties": {
+          "AllowedOrigins": {
+            "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
+            "type": "string"
+          },
+          "AllowedMethods": {
+            "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
+            "type": "string"
+          },
+          "AllowedHeaders": {
+            "description": "the request headers that the origin domain may specify on the CORS request.",
+            "type": "string"
+          },
+          "ExposedHeaders": {
+            "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
+            "type": "string"
+          },
+          "MaxAgeInSeconds": {
+            "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+            "type": "integer",
+            "minimum": 0
+          }
+        }
+      },
+      "ErrorCode": {
+        "description": "Error codes returned by the service",
+        "type": "string",
+        "enum": [
+          "AccountAlreadyExists",
+          "AccountBeingCreated",
+          "AccountIsDisabled",
+          "AuthenticationFailed",
+          "AuthorizationFailure",
+          "ConditionHeadersNotSupported",
+          "ConditionNotMet",
+          "EmptyMetadataKey",
+          "InsufficientAccountPermissions",
+          "InternalError",
+          "InvalidAuthenticationInfo",
+          "InvalidHeaderValue",
+          "InvalidHttpVerb",
+          "InvalidInput",
+          "InvalidMd5",
+          "InvalidMetadata",
+          "InvalidQueryParameterValue",
+          "InvalidRange",
+          "InvalidResourceName",
+          "InvalidUri",
+          "InvalidXmlDocument",
+          "InvalidXmlNodeValue",
+          "Md5Mismatch",
+          "MetadataTooLarge",
+          "MissingContentLengthHeader",
+          "MissingRequiredQueryParameter",
+          "MissingRequiredHeader",
+          "MissingRequiredXmlNode",
+          "MultipleConditionHeadersNotSupported",
+          "OperationTimedOut",
+          "OutOfRangeInput",
+          "OutOfRangeQueryParameterValue",
+          "RequestBodyTooLarge",
+          "ResourceTypeMismatch",
+          "RequestUrlFailedToParse",
+          "ResourceAlreadyExists",
+          "ResourceNotFound",
+          "ServerBusy",
+          "UnsupportedHeader",
+          "UnsupportedXmlNode",
+          "UnsupportedQueryParameter",
+          "UnsupportedHttpVerb",
+          "InvalidMarker",
+          "MessageNotFound",
+          "MessageTooLarge",
+          "PopReceiptMismatch",
+          "QueueAlreadyExists",
+          "QueueBeingDeleted",
+          "QueueDisabled",
+          "QueueNotEmpty",
+          "QueueNotFound"
+        ],
+        "x-ms-enum": {
+          "name": "StorageErrorCode",
+          "modelAsString": true
+        }
+      },
+      "GeoReplication": {
+        "type": "object",
+        "required": [
+          "Status",
+          "LastSyncTime"
+        ],
+        "properties": {
+          "Status": {
+            "description": "The status of the secondary location",
+            "type": "string",
+            "enum": [
+              "live",
+              "bootstrap",
+              "unavailable"
+            ],
+            "x-ms-enum": {
+              "name": "GeoReplicationStatusType",
+              "modelAsString": true
+            }
+          },
+          "LastSyncTime": {
+            "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
+            "type": "string",
+            "format": "date-time-rfc1123"
+          }
+        }
+      },
+      "Logging": {
+        "description": "Azure Analytics Logging settings.",
+        "type": "object",
+        "required": [
+          "Version",
+          "Delete",
+          "Read",
+          "Write",
+          "RetentionPolicy"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Delete": {
+            "description": "Indicates whether all delete requests should be logged.",
+            "type": "boolean"
+          },
+          "Read": {
+            "description": "Indicates whether all read requests should be logged.",
+            "type": "boolean"
+          },
+          "Write": {
+            "description": "Indicates whether all write requests should be logged.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "Metadata": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "string"
+        }
+      },
+      "StorageError": {
+        "type": "object",
+        "properties": {
+          "Message": {
+            "type": "string"
+          }
+        }
+      },
+      "Metrics": {
+        "description": "",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Enabled": {
+            "description": "Indicates whether metrics are enabled for the Queue service.",
+            "type": "boolean"
+          },
+          "IncludeAPIs": {
+            "description": "Indicates whether metrics should generate summary statistics for called API operations.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "QueueItem": {
+        "description": "An Azure Storage Queue.",
+        "type": "object",
+        "required": [
+          "Name"
+        ],
+        "properties": {
+          "Name": {
+            "type": "string",
+            "description": "The name of the Queue."
+          },
+          "Metadata": {
+            "$ref": "#/definitions/Metadata"
+          }
+        },
+        "xml": {
+          "name": "Queue"
+        }
+      },
+      "QueueMessage": {
+        "description": "A Message object which can be stored in a Queue",
+        "type": "object",
+        "required": [
+          "MessageText"
+        ],
+        "properties": {
+          "MessageText": {
+            "type": "string",
+            "description": "The content of the message"
+          }
+        }
+      },
+      "DequeuedMessageItem": {
+        "description": "The object returned in the QueueMessageList array when calling Get Messages on a Queue.",
+        "type": "object",
+        "required": [
+          "MessageId",
+          "InsertionTime",
+          "ExpirationTime",
+          "PopReceipt",
+          "TimeNextVisible",
+          "DequeueCount",
+          "MessageText"
+        ],
+        "properties": {
+          "MessageId": {
+            "type": "string",
+            "description": "The Id of the Message."
+          },
+          "InsertionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time the Message was inserted into the Queue."
+          },
+          "ExpirationTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the Message will expire and be automatically deleted."
+          },
+          "PopReceipt": {
+            "type": "string",
+            "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
+          },
+          "TimeNextVisible": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the message will again become visible in the Queue."
+          },
+          "DequeueCount": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of times the message has been dequeued."
+          },
+          "MessageText": {
+            "type": "string",
+            "description": "The content of the Message."
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessage"
+        }
+      },
+      "PeekedMessageItem": {
+        "description": "The object returned in the QueueMessageList array when calling Peek Messages on a Queue",
+        "type": "object",
+        "required": [
+          "MessageId",
+          "InsertionTime",
+          "ExpirationTime",
+          "DequeueCount",
+          "MessageText"
+        ],
+        "properties": {
+          "MessageId": {
+            "type": "string",
+            "description": "The Id of the Message."
+          },
+          "InsertionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time the Message was inserted into the Queue."
+          },
+          "ExpirationTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the Message will expire and be automatically deleted."
+          },
+          "DequeueCount": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of times the message has been dequeued."
+          },
+          "MessageText": {
+            "type": "string",
+            "description": "The content of the Message."
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessage"
+        }
+      },
+      "EnqueuedMessage": {
+        "description": "The object returned in the QueueMessageList array when calling Put Message on a Queue",
+        "type": "object",
+        "required": [
+          "MessageId",
+          "InsertionTime",
+          "ExpirationTime",
+          "PopReceipt",
+          "TimeNextVisible"
+        ],
+        "properties": {
+          "MessageId": {
+            "type": "string",
+            "description": "The Id of the Message."
+          },
+          "InsertionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time the Message was inserted into the Queue."
+          },
+          "ExpirationTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the Message will expire and be automatically deleted."
+          },
+          "PopReceipt": {
+            "type": "string",
+            "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
+          },
+          "TimeNextVisible": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the message will again become visible in the Queue."
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessage"
+        }
+      },
+      "DequeuedMessagesList": {
+        "description": "The object returned when calling Get Messages on a Queue",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/DequeuedMessageItem",
+          "xml": {
+            "name": "QueueMessage"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessagesList"
+        }
+      },
+      "PeekedMessagesList": {
+        "description": "The object returned when calling Peek Messages on a Queue",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/PeekedMessageItem",
+          "xml": {
+            "name": "QueueMessage"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessagesList"
+        }
+      },
+      "EnqueuedMessageList": {
+        "description": "The object returned when calling Put Message on a Queue",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/EnqueuedMessage",
+          "xml": {
+            "name": "QueueMessage"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessagesList"
+        }
+      },
+      "RetentionPolicy": {
+        "description": "the retention policy",
+        "type": "object",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Enabled": {
+            "description": "Indicates whether a retention policy is enabled for the storage service",
+            "type": "boolean"
+          },
+          "Days": {
+            "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
+            "type": "integer",
+            "minimum": 1
+          }
+        }
+      },
+      "SignedIdentifier": {
+        "description": "signed identifier",
+        "type": "object",
+        "required": [
+          "Id",
+          "AccessPolicy"
+        ],
+        "properties": {
+          "Id": {
+            "type": "string",
+            "description": "a unique id"
+          },
+          "AccessPolicy": {
+            "description": "The access policy",
+            "$ref": "#/definitions/AccessPolicy"
+          }
+        }
+      },
+      "SignedIdentifiers": {
+        "description": "a collection of signed identifiers",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/SignedIdentifier",
+          "xml": {
+            "name": "SignedIdentifier"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "SignedIdentifiers"
+        }
+      },
+      "StorageServiceProperties": {
+        "description": "Storage Service Properties.",
+        "type": "object",
+        "properties": {
+          "Logging": {
+            "description": "Azure Analytics Logging settings",
+            "$ref": "#/definitions/Logging"
+          },
+          "HourMetrics": {
+            "description": "A summary of request statistics grouped by API in hourly aggregates for queues",
+            "$ref": "#/definitions/Metrics"
+          },
+          "MinuteMetrics": {
+            "description": "a summary of request statistics grouped by API in minute aggregates for queues",
+            "$ref": "#/definitions/Metrics"
+          },
+          "Cors": {
+            "description": "The set of CORS rules.",
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/CorsRule",
+              "xml": {
+                "name": "CorsRule"
+              }
+            },
+            "xml": {
+              "wrapped": true
+            }
+          }
+        }
+      },
+      "StorageServiceStats": {
+        "description": "Stats for the storage service.",
+        "type": "object",
+        "properties": {
+          "GeoReplication": {
+            "description": "Geo-Replication information for the Secondary Storage Service",
+            "$ref": "#/definitions/GeoReplication"
+          }
+        }
+      }
+    },
+    "parameters": {
+      "Url": {
+        "name": "url",
+        "description": "The URL of the service account, queue or message that is the targe of the desired operation.",
+        "required": true,
+        "type": "string",
+        "in": "path",
+        "x-ms-skip-url-encoding": true
+      },
+      "ApiVersionParameter": {
+        "name": "x-ms-version",
+        "x-ms-client-name": "version",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "description": "Specifies the version of the operation to use for this request.",
+        "enum": [
+          "2018-03-28"
+        ]
+      },
+      "Body": {
+        "name": "body",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "type": "object",
+          "format": "file"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Initial data"
+      },
+      "QueueAcl": {
+        "name": "queueAcl",
+        "in": "body",
+        "schema": {
+          "$ref": "#/definitions/SignedIdentifiers"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "the acls for the queue"
+      },
+      "ClientRequestId": {
+        "name": "x-ms-client-request-id",
+        "x-ms-client-name": "requestId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "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."
+      },
+      "ContentLength": {
+        "name": "Content-Length",
+        "in": "header",
+        "required": true,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "The length of the request."
+      },
+      "ListQueuesInclude": {
+        "name": "include", 
+        "in": "query", 
+        "required": false, 
+        "type": "array",
+        "collectionFormat": "csv",
+        "items": {
+        "type": "string", 
+        "enum": [ 
+          "metadata" 
+        ], 
+        "x-ms-enum": { 
+          "name": "ListQueuesIncludeType", 
+          "modelAsString": false 
+          }
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Include this parameter to specify that the queues's metadata be returned as part of the response body."
+      },
+      "Marker": {
+        "name": "marker",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "A string value that identifies the portion of the list of queues to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all queues remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
+        "x-ms-parameter-location": "method"
+      },
+      "MaxResults": {
+        "name": "maxresults",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 1,
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the maximum number of queues to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
+      },
+      "MessageId": {
+        "name": "messageid",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The container name."
+      },
+      "MessageTTL": {
+        "name": "messagettl",
+        "x-ms-client-name": "MessageTimeToLive",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": -1,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies the time-to-live interval for the message, in seconds. Prior to version 2017-07-29, the maximum time-to-live allowed is 7 days. For version 2017-07-29 or later, the maximum time-to-live can be any positive number, as well as -1 indicating that the message does not expire. If this parameter is omitted, the default time-to-live is 7 days."
+      },
+      "Metadata": {
+        "name": "x-ms-meta",
+        "x-ms-client-name": "metadata",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Include this parameter to specify that the queue's metadata be returned as part of the response body. Note that metadata requested with this parameter must be stored in accordance with the naming restrictions imposed by the 2009-09-19 version of the Queue service. Beginning with this version, all metadata names must adhere to the naming conventions for C# identifiers.",
+        "x-ms-header-collection-prefix": "x-ms-meta-"
+      },
+      "NumOfMessages": {
+        "name": "numofmessages",
+        "x-ms-client-name": "numberOfMessages",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 1,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation."
+      },
+      "PopReceipt": {
+        "name": "popreceipt",
+        "x-ms-client-name": "popReceipt",
+        "in": "query",
+        "required": true,
+        "x-ms-parameter-location": "method",
+        "description": "Required. Specifies the valid pop receipt value returned from an earlier call to the Get Messages or Update Message operation.",
+        "type": "string"
+      },
+      "Prefix": {
+        "name": "prefix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "Filters the results to return only queues whose name begins with the specified prefix.",
+        "x-ms-parameter-location": "method"
+      },
+      "QueueMessage": {
+        "name": "QueueMessage",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/QueueMessage"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "A Message object which can be stored in a Queue"
+      },
+      "QueueName": {
+        "name": "queueName",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The queue name."
+      },
+      "StorageServiceProperties": {
+        "name": "StorageServiceProperties",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/StorageServiceProperties"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "The StorageService properties."
+      },
+      "Timeout": {
+        "name": "timeout",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 0,
+        "x-ms-parameter-location": "method",
+        "description": "The The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/setting-timeouts-for-queue-service-operations>Setting Timeouts for Queue Service Operations.</a>"
+      },
+      "VisibilityTimeout": {
+        "name": "visibilitytimeout",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 0,
+        "maximum": 604800,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
+      },
+      "VisibilityTimeoutRequired": {
+        "name": "visibilitytimeout",
+        "in": "query",
+        "required": true,
+        "type": "integer",
+        "minimum": 0,
+        "maximum": 604800,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
+      }
+    }
+  }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/swagger/queue.json b/sdk/storage/azure-storage-queue/swagger/queue.json
deleted file mode 100644
index 977d767b9f84..000000000000
--- a/sdk/storage/azure-storage-queue/swagger/queue.json
+++ /dev/null
@@ -1,1898 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Azure Queue Storage",
-    "version": "2018-03-28",
-    "x-ms-code-generation-settings": {
-      "header": "MIT",
-      "strictSpecAdherence": false
-    }
-  },
-  "x-ms-parameterized-host": {
-    "hostTemplate": "{url}",
-    "useSchemePrefix": false,
-    "positionInOperation": "first",
-    "parameters": [
-      {
-        "$ref": "#/parameters/Url"
-      }
-    ]
-  },
-  "securityDefinitions": {
-    "queue_shared_key": {
-      "type": "apiKey",
-      "name": "Authorization",
-      "in": "header"
-    }
-  },
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/xml"
-  ],
-  "produces": [
-    "application/xml"
-  ],
-  "paths": {},
-  "x-ms-paths": {
-    "/?restype=service&comp=properties": {
-      "put": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_SetProperties",
-        "description": "Sets properties for a storage account's Queue service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
-        "parameters": [
-          {
-            "$ref": "#/parameters/StorageServiceProperties"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Success (Accepted)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetProperties",
-        "description": "gets the properties of a storage account's Queue service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceProperties"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/?restype=service&comp=stats": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetStatistics",
-        "description": "Retrieves statistics related to replication for the Queue service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceStats"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "stats"
-          ]
-        }
-      ]
-    },
-    "/?comp=list": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_ListQueuesSegment",
-        "description": "The List Queues Segment operation returns a list of the queues under the specified account",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListQueuesInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListQueuesSegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/{queueName}": {
-      "put": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Queue_Create",
-        "description": "creates a new queue under the given account.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Success, queue created.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "204": {
-            "description": "Success, queue created.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_Delete",
-        "description": "operation permanently deletes the specified queue",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}?comp=metadata": {
-      "get": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_GetProperties",
-        "description": "Retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated with the queue as name-values pairs.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "x-ms-approximate-messages-count": {
-                "type": "integer",
-                "x-ms-client-name": "ApproximateMessagesCount",
-                "description": "The approximate number of messages in the queue. This number is not lower than the actual number of messages in the queue, but could be higher."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_SetMetadata",
-        "description": "sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "metadata"
-          ]
-        }
-      ]
-    },
-    "/{queueName}?comp=acl": {
-      "get": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_GetAccessPolicy",
-        "description": "returns details about any stored access policies specified on the queue that may be used with Shared Access Signatures.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/SignedIdentifiers"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_SetAccessPolicy",
-        "description": "sets stored access policies for the queue that may be used with Shared Access Signatures",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/QueueAcl"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acl"
-          ]
-        }
-      ]
-    },
-    "/{queueName}/messages": {
-      "get": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Dequeue",
-        "description": "The Dequeue operation retrieves one or more messages from the front of the queue.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/NumOfMessages"
-          },
-          {
-            "$ref": "#/parameters/VisibilityTimeout"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/DequeuedMessagesList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Clear",
-        "description": "The Clear operation deletes all messages from the specified queue.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}": {
-      "post": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Enqueue",
-        "description": "The Enqueue operation adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request with UTF-8 encoding. The encoded message can be up to 64 KB in size for versions 2011-08-18 and newer, or 8 KB in size for previous versions.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/QueueMessage"
-          },
-          {
-            "$ref": "#/parameters/VisibilityTimeout"
-          },
-          {
-            "$ref": "#/parameters/MessageTTL"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Created",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/EnqueuedMessageList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}/messages?peekonly=true": {
-      "get": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Peek",
-        "description": "The Peek operation retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/NumOfMessages"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/PeekedMessagesList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "peekonly",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "true"
-          ]
-        }
-      ]
-    },
-    "/{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}": {
-      "put": {
-        "tags": [
-          "messageId"
-        ],
-        "operationId": "MessageId_Update",
-        "description": "The Update operation was introduced with version 2011-08-18 of the Queue service API. The Update Message operation updates the visibility timeout of a message. You can also use this operation to update the contents of a message. A message must be in a format that can be included in an XML request with UTF-8 encoding, and the encoded message can be up to 64KB in size.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/MessageId"
-          },
-          {
-            "$ref": "#/parameters/QueueMessage"
-          },
-          {
-            "$ref": "#/parameters/PopReceipt"
-          },
-          {
-            "$ref": "#/parameters/VisibilityTimeoutRequired"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-popreceipt": {
-                "x-ms-client-name": "PopReceipt",
-                "type": "string",
-                "description": "The pop receipt of the queue message."
-              },
-              "x-ms-time-next-visible": {
-                "x-ms-client-name": "TimeNextVisible",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "A UTC date/time value that represents when the message will be visible on the queue."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}/messages/{messageid}?popreceipt={popReceipt}": {
-      "delete": {
-        "tags": [
-          "messageId"
-        ],
-        "operationId": "MessageId_Delete",
-        "description": "The Delete operation deletes the specified message.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/MessageId"
-          },
-          {
-            "$ref": "#/parameters/PopReceipt"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    }
-  },
-  "definitions": {
-    "AccessPolicy": {
-      "type": "object",
-      "required": [
-        "Start",
-        "Expiry",
-        "Permission"
-      ],
-      "description": "An Access policy",
-      "properties": {
-        "Start": {
-          "description": "the date-time the policy is active",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Expiry": {
-          "description": "the date-time the policy expires",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Permission": {
-          "description": "the permissions for the acl policy",
-          "type": "string"
-        }
-      }
-    },
-    "ListQueuesSegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "The object returned when calling List Queues on a Queue Service.",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "Prefix",
-        "MaxResults",
-        "NextMarker"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "QueueItems": {
-          "xml": {
-            "wrapped": true,
-            "name": "Queues"
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/QueueItem"
-          }
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "CorsRule": {
-      "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
-      "type": "object",
-      "required": [
-        "AllowedOrigins",
-        "AllowedMethods",
-        "AllowedHeaders",
-        "ExposedHeaders",
-        "MaxAgeInSeconds"
-      ],
-      "properties": {
-        "AllowedOrigins": {
-          "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
-          "type": "string"
-        },
-        "AllowedMethods": {
-          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
-          "type": "string"
-        },
-        "AllowedHeaders": {
-          "description": "the request headers that the origin domain may specify on the CORS request.",
-          "type": "string"
-        },
-        "ExposedHeaders": {
-          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
-          "type": "string"
-        },
-        "MaxAgeInSeconds": {
-          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
-          "type": "integer",
-          "minimum": 0
-        }
-      }
-    },
-    "ErrorCode": {
-      "description": "Error codes returned by the service",
-      "type": "string",
-      "enum": [
-        "AccountAlreadyExists",
-        "AccountBeingCreated",
-        "AccountIsDisabled",
-        "AuthenticationFailed",
-        "AuthorizationFailure",
-        "ConditionHeadersNotSupported",
-        "ConditionNotMet",
-        "EmptyMetadataKey",
-        "InsufficientAccountPermissions",
-        "InternalError",
-        "InvalidAuthenticationInfo",
-        "InvalidHeaderValue",
-        "InvalidHttpVerb",
-        "InvalidInput",
-        "InvalidMd5",
-        "InvalidMetadata",
-        "InvalidQueryParameterValue",
-        "InvalidRange",
-        "InvalidResourceName",
-        "InvalidUri",
-        "InvalidXmlDocument",
-        "InvalidXmlNodeValue",
-        "Md5Mismatch",
-        "MetadataTooLarge",
-        "MissingContentLengthHeader",
-        "MissingRequiredQueryParameter",
-        "MissingRequiredHeader",
-        "MissingRequiredXmlNode",
-        "MultipleConditionHeadersNotSupported",
-        "OperationTimedOut",
-        "OutOfRangeInput",
-        "OutOfRangeQueryParameterValue",
-        "RequestBodyTooLarge",
-        "ResourceTypeMismatch",
-        "RequestUrlFailedToParse",
-        "ResourceAlreadyExists",
-        "ResourceNotFound",
-        "ServerBusy",
-        "UnsupportedHeader",
-        "UnsupportedXmlNode",
-        "UnsupportedQueryParameter",
-        "UnsupportedHttpVerb",
-        "InvalidMarker",
-        "MessageNotFound",
-        "MessageTooLarge",
-        "PopReceiptMismatch",
-        "QueueAlreadyExists",
-        "QueueBeingDeleted",
-        "QueueDisabled",
-        "QueueNotEmpty",
-        "QueueNotFound"
-      ],
-      "x-ms-enum": {
-        "name": "StorageErrorCode",
-        "modelAsString": true
-      }
-    },
-    "GeoReplication": {
-      "type": "object",
-      "required": [
-        "Status",
-        "LastSyncTime"
-      ],
-      "properties": {
-        "Status": {
-          "description": "The status of the secondary location",
-          "type": "string",
-          "enum": [
-            "live",
-            "bootstrap",
-            "unavailable"
-          ],
-          "x-ms-enum": {
-            "name": "GeoReplicationStatusType",
-            "modelAsString": true
-          }
-        },
-        "LastSyncTime": {
-          "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
-          "type": "string",
-          "format": "date-time-rfc1123"
-        }
-      }
-    },
-    "Logging": {
-      "description": "Azure Analytics Logging settings.",
-      "type": "object",
-      "required": [
-        "Version",
-        "Delete",
-        "Read",
-        "Write",
-        "RetentionPolicy"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Delete": {
-          "description": "Indicates whether all delete requests should be logged.",
-          "type": "boolean"
-        },
-        "Read": {
-          "description": "Indicates whether all read requests should be logged.",
-          "type": "boolean"
-        },
-        "Write": {
-          "description": "Indicates whether all write requests should be logged.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "Metadata": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "StorageError": {
-      "type": "object",
-      "properties": {
-        "Message": {
-          "type": "string"
-        }
-      }
-    },
-    "Metrics": {
-      "description": "",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Enabled": {
-          "description": "Indicates whether metrics are enabled for the Queue service.",
-          "type": "boolean"
-        },
-        "IncludeAPIs": {
-          "description": "Indicates whether metrics should generate summary statistics for called API operations.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "QueueItem": {
-      "description": "An Azure Storage Queue.",
-      "type": "object",
-      "required": [
-        "Name"
-      ],
-      "properties": {
-        "Name": {
-          "type": "string",
-          "description": "The name of the Queue."
-        },
-        "Metadata": {
-          "$ref": "#/definitions/Metadata"
-        }
-      },
-      "xml": {
-        "name": "Queue"
-      }
-    },
-    "QueueMessage": {
-      "description": "A Message object which can be stored in a Queue",
-      "type": "object",
-      "required": [
-        "MessageText"
-      ],
-      "properties": {
-        "MessageText": {
-          "type": "string",
-          "description": "The content of the message"
-        }
-      }
-    },
-    "DequeuedMessage": {
-      "description": "The object returned in the QueueMessageList array when calling Get Messages on a Queue.",
-      "type": "object",
-      "required": [
-        "MessageId",
-        "InsertionTime",
-        "ExpirationTime",
-        "PopReceipt",
-        "TimeNextVisible",
-        "DequeueCount",
-        "MessageText"
-      ],
-      "properties": {
-        "MessageId": {
-          "type": "string",
-          "description": "The Id of the Message."
-        },
-        "InsertionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time the Message was inserted into the Queue."
-        },
-        "ExpirationTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the Message will expire and be automatically deleted."
-        },
-        "PopReceipt": {
-          "type": "string",
-          "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
-        },
-        "TimeNextVisible": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the message will again become visible in the Queue."
-        },
-        "DequeueCount": {
-          "type": "integer",
-          "format": "int64",
-          "description": "The number of times the message has been dequeued."
-        },
-        "MessageText": {
-          "type": "string",
-          "description": "The content of the Message."
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessage"
-      }
-    },
-    "PeekedMessage": {
-      "description": "The object returned in the QueueMessageList array when calling Peek Messages on a Queue",
-      "type": "object",
-      "required": [
-        "MessageId",
-        "InsertionTime",
-        "ExpirationTime",
-        "DequeueCount",
-        "MessageText"
-      ],
-      "properties": {
-        "MessageId": {
-          "type": "string",
-          "description": "The Id of the Message."
-        },
-        "InsertionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time the Message was inserted into the Queue."
-        },
-        "ExpirationTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the Message will expire and be automatically deleted."
-        },
-        "DequeueCount": {
-          "type": "integer",
-          "format": "int64",
-          "description": "The number of times the message has been dequeued."
-        },
-        "MessageText": {
-          "type": "string",
-          "description": "The content of the Message."
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessage"
-      }
-    },
-    "EnqueuedMessage": {
-      "description": "The object returned in the QueueMessageList array when calling Put Message on a Queue",
-      "type": "object",
-      "required": [
-        "MessageId",
-        "InsertionTime",
-        "ExpirationTime",
-        "PopReceipt",
-        "TimeNextVisible"
-      ],
-      "properties": {
-        "MessageId": {
-          "type": "string",
-          "description": "The Id of the Message."
-        },
-        "InsertionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time the Message was inserted into the Queue."
-        },
-        "ExpirationTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the Message will expire and be automatically deleted."
-        },
-        "PopReceipt": {
-          "type": "string",
-          "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
-        },
-        "TimeNextVisible": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the message will again become visible in the Queue."
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessage"
-      }
-    },
-    "DequeuedMessagesList": {
-      "description": "The object returned when calling Get Messages on a Queue",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/DequeuedMessage",
-        "xml": {
-          "name": "QueueMessage"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessagesList"
-      }
-    },
-    "PeekedMessagesList": {
-      "description": "The object returned when calling Peek Messages on a Queue",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/PeekedMessage",
-        "xml": {
-          "name": "QueueMessage"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessagesList"
-      }
-    },
-    "EnqueuedMessageList": {
-      "description": "The object returned when calling Put Message on a Queue",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/EnqueuedMessage",
-        "xml": {
-          "name": "QueueMessage"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessagesList"
-      }
-    },
-    "RetentionPolicy": {
-      "description": "the retention policy",
-      "type": "object",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Enabled": {
-          "description": "Indicates whether a retention policy is enabled for the storage service",
-          "type": "boolean"
-        },
-        "Days": {
-          "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
-          "type": "integer",
-          "minimum": 1
-        }
-      }
-    },
-    "SignedIdentifier": {
-      "description": "signed identifier",
-      "type": "object",
-      "required": [
-        "Id",
-        "AccessPolicy"
-      ],
-      "properties": {
-        "Id": {
-          "type": "string",
-          "description": "a unique id"
-        },
-        "AccessPolicy": {
-          "description": "The access policy",
-          "$ref": "#/definitions/AccessPolicy"
-        }
-      }
-    },
-    "SignedIdentifiers": {
-      "description": "a collection of signed identifiers",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/SignedIdentifier",
-        "xml": {
-          "name": "SignedIdentifier"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "SignedIdentifiers"
-      }
-    },
-    "StorageServiceProperties": {
-      "description": "Storage Service Properties.",
-      "type": "object",
-      "properties": {
-        "Logging": {
-          "description": "Azure Analytics Logging settings",
-          "$ref": "#/definitions/Logging"
-        },
-        "HourMetrics": {
-          "description": "A summary of request statistics grouped by API in hourly aggregates for queues",
-          "$ref": "#/definitions/Metrics"
-        },
-        "MinuteMetrics": {
-          "description": "a summary of request statistics grouped by API in minute aggregates for queues",
-          "$ref": "#/definitions/Metrics"
-        },
-        "Cors": {
-          "description": "The set of CORS rules.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/CorsRule",
-            "xml": {
-              "name": "CorsRule"
-            }
-          },
-          "xml": {
-            "wrapped": true
-          }
-        }
-      }
-    },
-    "StorageServiceStats": {
-      "description": "Stats for the storage service.",
-      "type": "object",
-      "properties": {
-        "GeoReplication": {
-          "description": "Geo-Replication information for the Secondary Storage Service",
-          "$ref": "#/definitions/GeoReplication"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "Url": {
-      "name": "url",
-      "description": "The URL of the service account, queue or message that is the targe of the desired operation.",
-      "required": true,
-      "type": "string",
-      "in": "path",
-      "x-ms-skip-url-encoding": true
-    },
-    "ApiVersionParameter": {
-      "name": "x-ms-version",
-      "x-ms-client-name": "version",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "description": "Specifies the version of the operation to use for this request.",
-      "enum": [
-        "2018-03-28"
-      ]
-    },
-    "Body": {
-      "name": "body",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "type": "object",
-        "format": "file"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Initial data"
-    },
-    "QueueAcl": {
-      "name": "queueAcl",
-      "in": "body",
-      "schema": {
-        "$ref": "#/definitions/SignedIdentifiers"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "the acls for the queue"
-    },
-    "ClientRequestId": {
-      "name": "x-ms-client-request-id",
-      "x-ms-client-name": "requestId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "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."
-    },
-    "ContentLength": {
-      "name": "Content-Length",
-      "in": "header",
-      "required": true,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "The length of the request."
-    },
-    "ListQueuesInclude": {
-      "name": "include", 
-      "in": "query", 
-      "required": false, 
-      "type": "array",
-      "collectionFormat": "csv",
-      "items": {
-      "type": "string", 
-      "enum": [ 
-        "metadata" 
-      ], 
-      "x-ms-enum": { 
-        "name": "ListQueuesIncludeType", 
-        "modelAsString": false 
-        }
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Include this parameter to specify that the queues's metadata be returned as part of the response body."
-    },
-    "Marker": {
-      "name": "marker",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "A string value that identifies the portion of the list of queues to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all queues remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
-      "x-ms-parameter-location": "method"
-    },
-    "MaxResults": {
-      "name": "maxresults",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 1,
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the maximum number of queues to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
-    },
-    "MessageId": {
-      "name": "messageid",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The message ID name."
-    },
-    "MessageTTL": {
-      "name": "messagettl",
-      "x-ms-client-name": "MessageTimeToLive",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": -1,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the time-to-live interval for the message, in seconds. Prior to version 2017-07-29, the maximum time-to-live allowed is 7 days. For version 2017-07-29 or later, the maximum time-to-live can be any positive number, as well as -1 indicating that the message does not expire. If this parameter is omitted, the default time-to-live is 7 days."
-    },
-    "Metadata": {
-      "name": "x-ms-meta",
-      "x-ms-client-name": "metadata",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Include this parameter to specify that the queue's metadata be returned as part of the response body. Note that metadata requested with this parameter must be stored in accordance with the naming restrictions imposed by the 2009-09-19 version of the Queue service. Beginning with this version, all metadata names must adhere to the naming conventions for C# identifiers.",
-      "x-ms-header-collection-prefix": "x-ms-meta-"
-    },
-    "NumOfMessages": {
-      "name": "numofmessages",
-      "x-ms-client-name": "numberOfMessages",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 1,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation."
-    },
-    "PopReceipt": {
-      "name": "popreceipt",
-      "x-ms-client-name": "popReceipt",
-      "in": "query",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "description": "Required. Specifies the valid pop receipt value returned from an earlier call to the Get Messages or Update Message operation.",
-      "type": "string"
-    },
-    "Prefix": {
-      "name": "prefix",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "Filters the results to return only queues whose name begins with the specified prefix.",
-      "x-ms-parameter-location": "method"
-    },
-    "QueueMessage": {
-      "name": "QueueMessage",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/QueueMessage"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "A Message object which can be stored in a Queue"
-    },
-    "QueueName": {
-      "name": "queueName",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The queue name."
-    },
-    "StorageServiceProperties": {
-      "name": "StorageServiceProperties",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/StorageServiceProperties"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "The StorageService properties."
-    },
-    "Timeout": {
-      "name": "timeout",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 0,
-      "x-ms-parameter-location": "method",
-      "description": "The The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/setting-timeouts-for-queue-service-operations>Setting Timeouts for Queue Service Operations.</a>"
-    },
-    "VisibilityTimeout": {
-      "name": "visibilitytimeout",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 604800,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
-    },
-    "VisibilityTimeoutRequired": {
-      "name": "visibilitytimeout",
-      "in": "query",
-      "required": true,
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 604800,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
-    }
-  }
-}
\ No newline at end of file
diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml
index 3c5ff41f6fc2..0d15dd67d620 100644
--- a/sdk/template/azure-sdk-template/pom.xml
+++ b/sdk/template/azure-sdk-template/pom.xml
@@ -1,17 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.3.0</version>
     <relativePath>../../../pom.client.xml</relativePath>
   </parent>
 
   <artifactId>azure-sdk-template</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <version>1.0.2</version>
 
   <name>Microsoft Azure SDK for Template</name>
   <description>This package contains Microsoft Azure SDK for Template.</description>
@@ -23,9 +22,16 @@
     </site>
   </distributionManagement>
 
-  <scm><url>https://github.com/Azure/azure-sdk-for-java</url></scm>
+  <scm>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
+  </scm>
 
   <dependencies>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core</artifactId>
+      <version>1.0.0-preview.3</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/sql/resource-manager/v2017_03_01_preview/pom.xml b/sql/resource-manager/v2017_03_01_preview/pom.xml
index 30cff3767809..d345667442f0 100644
--- a/sql/resource-manager/v2017_03_01_preview/pom.xml
+++ b/sql/resource-manager/v2017_03_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabaseBlobAuditingPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabaseBlobAuditingPolicy.java
index 9abd8433761f..8c34b03f2cbe 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabaseBlobAuditingPolicy.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabaseBlobAuditingPolicy.java
@@ -189,7 +189,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
@@ -342,7 +342,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.java
new file mode 100644
index 000000000000..a8ccb62d2956
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.java
@@ -0,0 +1,118 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.ManagedBackupShortTermRetentionPolicyInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.
+ */
+public interface DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy extends HasInner<ManagedBackupShortTermRetentionPolicyInner>, Indexable, Refreshable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>, Updatable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.Update>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the retentionDays value.
+     */
+    Integer retentionDays();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithDatabasis, DefinitionStages.WithRetentionDays, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy definition.
+         */
+        interface Blank extends WithDatabasis {
+        }
+
+        /**
+         * The stage of the databasismanagedinstancemanagedbackupshorttermretentionpolicy definition allowing to specify Databasis.
+         */
+        interface WithDatabasis {
+           /**
+            * Specifies resourceGroupName, managedInstanceName, databaseName.
+            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param managedInstanceName The name of the managed instance
+            * @param databaseName The name of the database
+            * @return the next definition stage
+            */
+            WithRetentionDays withExistingDatabasis(String resourceGroupName, String managedInstanceName, String databaseName);
+        }
+
+        /**
+         * The stage of the databasismanagedinstancemanagedbackupshorttermretentionpolicy definition allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+           /**
+            * Specifies retentionDays.
+            * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported
+            * @return the next definition stage
+            */
+            WithCreate withRetentionDays(Integer retentionDays);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> {
+        }
+    }
+    /**
+     * The template for a DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>, UpdateStages.WithRetentionDays {
+    }
+
+    /**
+     * Grouping of DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the databasismanagedinstancemanagedbackupshorttermretentionpolicy update allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+            /**
+             * Specifies retentionDays.
+             * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported
+             * @return the next update stage
+             */
+            Update withRetentionDays(Integer retentionDays);
+        }
+
+    }
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabel.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabel.java
new file mode 100644
index 000000000000..21c1e23aca52
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabel.java
@@ -0,0 +1,60 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SensitivityLabelInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing DatabasisServerSensitivityLabel.
+ */
+public interface DatabasisServerSensitivityLabel extends HasInner<SensitivityLabelInner>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the informationType value.
+     */
+    String informationType();
+
+    /**
+     * @return the informationTypeId value.
+     */
+    String informationTypeId();
+
+    /**
+     * @return the isDisabled value.
+     */
+    Boolean isDisabled();
+
+    /**
+     * @return the labelId value.
+     */
+    String labelId();
+
+    /**
+     * @return the labelName value.
+     */
+    String labelName();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabelModel.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabelModel.java
new file mode 100644
index 000000000000..9d49d9cfc18d
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabelModel.java
@@ -0,0 +1,60 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SensitivityLabelInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing DatabasisServerSensitivityLabelModel.
+ */
+public interface DatabasisServerSensitivityLabelModel extends HasInner<SensitivityLabelInner>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the informationType value.
+     */
+    String informationType();
+
+    /**
+     * @return the informationTypeId value.
+     */
+    String informationTypeId();
+
+    /**
+     * @return the isDisabled value.
+     */
+    Boolean isDisabled();
+
+    /**
+     * @return the labelId value.
+     */
+    String labelId();
+
+    /**
+     * @return the labelName value.
+     */
+    String labelName();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedDatabaseBlobAuditingPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedDatabaseBlobAuditingPolicy.java
index 07a725482b99..dbc72432a406 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedDatabaseBlobAuditingPolicy.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedDatabaseBlobAuditingPolicy.java
@@ -189,7 +189,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
@@ -354,7 +354,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedServerBlobAuditingPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedServerBlobAuditingPolicy.java
index a1f779c1dac3..40e44bbda509 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedServerBlobAuditingPolicy.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedServerBlobAuditingPolicy.java
@@ -188,7 +188,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
@@ -353,7 +353,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobSchedule.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobSchedule.java
index 788a7ecb607d..28da5d250b08 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobSchedule.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobSchedule.java
@@ -40,7 +40,7 @@ public class JobSchedule {
     private Boolean enabled;
 
     /**
-     * Value of the schedule's recurring interval, if the scheduletype is
+     * Value of the schedule's recurring interval, if the schedule type is
      * recurring. ISO8601 duration format.
      */
     @JsonProperty(value = "interval")
@@ -127,7 +127,7 @@ public JobSchedule withEnabled(Boolean enabled) {
     }
 
     /**
-     * Get value of the schedule's recurring interval, if the scheduletype is recurring. ISO8601 duration format.
+     * Get value of the schedule's recurring interval, if the schedule type is recurring. ISO8601 duration format.
      *
      * @return the interval value
      */
@@ -136,7 +136,7 @@ public String interval() {
     }
 
     /**
-     * Set value of the schedule's recurring interval, if the scheduletype is recurring. ISO8601 duration format.
+     * Set value of the schedule's recurring interval, if the schedule type is recurring. ISO8601 duration format.
      *
      * @param interval the interval value to set
      * @return the JobSchedule object itself.
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobStepExecutions.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobStepExecutions.java
index ca9d5c77d55b..d096a4ddb832 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobStepExecutions.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobStepExecutions.java
@@ -9,8 +9,7 @@
 package com.microsoft.azure.management.sql.v2017_03_01_preview;
 
 import rx.Observable;
-
-import java.util.UUID;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ExecutionJobJobAgentServerJobExecution;
 
 /**
  * Type representing JobStepExecutions.
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/LongTermRetentionBackups.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/LongTermRetentionBackups.java
index 8a63b778727a..5ecd51c6a511 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/LongTermRetentionBackups.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/LongTermRetentionBackups.java
@@ -20,55 +20,114 @@ public interface LongTermRetentionBackups extends HasInner<LongTermRetentionBack
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<LongTermRetentionBackup> listByLocationAsync(final String locationName);
+    Observable<LongTermRetentionBackup> listByResourceGroupLocationAsync(final String resourceGroupName, final String locationName);
 
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<LongTermRetentionBackup> listByServerAsync(final String locationName, final String longTermRetentionServerName);
+    Observable<LongTermRetentionBackup> listByResourceGroupServerAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName);
 
     /**
      * Gets a long term retention backup.
      *
      * @param locationName The location of the database.
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
     Observable<LongTermRetentionBackup> getAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName);
 
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName);
+
     /**
      * Lists all long term retention backups for a database.
      *
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
     Observable<LongTermRetentionBackup> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName);
 
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LongTermRetentionBackup> listByLocationAsync(final String locationName);
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LongTermRetentionBackup> listByServerAsync(final String locationName, final String longTermRetentionServerName);
+
+    /**
+     * Gets a long term retention backup.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param locationName The location of the database.
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LongTermRetentionBackup> getByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName);
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LongTermRetentionBackup> listByResourceGroupDatabaseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName);
+
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName);
+    Completable deleteByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName);
 
 }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedBackupShortTermRetentionPolicies.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedBackupShortTermRetentionPolicies.java
index 03caf7827e71..d688cbdf5c32 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedBackupShortTermRetentionPolicies.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedBackupShortTermRetentionPolicies.java
@@ -16,7 +16,7 @@
 /**
  * Type representing ManagedBackupShortTermRetentionPolicies.
  */
-public interface ManagedBackupShortTermRetentionPolicies extends SupportsCreating<ManagedBackupShortTermRetentionPolicy.DefinitionStages.Blank>, HasInner<ManagedBackupShortTermRetentionPoliciesInner> {
+public interface ManagedBackupShortTermRetentionPolicies extends SupportsCreating<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.DefinitionStages.Blank>, HasInner<ManagedBackupShortTermRetentionPoliciesInner> {
     /**
      * Gets a managed database's short term retention policy.
      *
@@ -26,7 +26,7 @@ public interface ManagedBackupShortTermRetentionPolicies extends SupportsCreatin
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ManagedBackupShortTermRetentionPolicy> getAsync(String resourceGroupName, String managedInstanceName, String databaseName);
+    Observable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> getAsync(String resourceGroupName, String managedInstanceName, String databaseName);
 
     /**
      * Gets a managed database's short term retention policy list.
@@ -37,6 +37,6 @@ public interface ManagedBackupShortTermRetentionPolicies extends SupportsCreatin
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ManagedBackupShortTermRetentionPolicy> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName);
+    Observable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName);
 
 }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabase.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabase.java
index 555f5588dd34..c41adf6979a4 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabase.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabase.java
@@ -74,6 +74,16 @@ public interface ManagedDatabase extends HasInner<ManagedDatabaseInner>, Indexab
      */
     String name();
 
+    /**
+     * @return the recoverableDatabaseId value.
+     */
+    String recoverableDatabaseId();
+
+    /**
+     * @return the restorableDroppedDatabaseId value.
+     */
+    String restorableDroppedDatabaseId();
+
     /**
      * @return the restorePointInTime value.
      */
@@ -180,12 +190,36 @@ interface WithCollation {
         interface WithCreateMode {
             /**
              * Specifies createMode.
-             * @param createMode Managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'
+             * @param createMode Managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Recovery: Creates a database by restoring a geo-replicated backup. RecoverableDatabaseId must be specified as the recoverable database resource ID to restore. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore', 'Recovery'
              * @return the next definition stage
              */
             WithCreate withCreateMode(ManagedDatabaseCreateMode createMode);
         }
 
+        /**
+         * The stage of the manageddatabase definition allowing to specify RecoverableDatabaseId.
+         */
+        interface WithRecoverableDatabaseId {
+            /**
+             * Specifies recoverableDatabaseId.
+             * @param recoverableDatabaseId The resource identifier of the recoverable database associated with create operation of this database
+             * @return the next definition stage
+             */
+            WithCreate withRecoverableDatabaseId(String recoverableDatabaseId);
+        }
+
+        /**
+         * The stage of the manageddatabase definition allowing to specify RestorableDroppedDatabaseId.
+         */
+        interface WithRestorableDroppedDatabaseId {
+            /**
+             * Specifies restorableDroppedDatabaseId.
+             * @param restorableDroppedDatabaseId The restorable dropped database resource id to restore when creating this database
+             * @return the next definition stage
+             */
+            WithCreate withRestorableDroppedDatabaseId(String restorableDroppedDatabaseId);
+        }
+
         /**
          * The stage of the manageddatabase definition allowing to specify RestorePointInTime.
          */
@@ -251,13 +285,13 @@ interface WithTags {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<ManagedDatabase>, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithStorageContainerSasToken, DefinitionStages.WithStorageContainerUri, DefinitionStages.WithTags {
+        interface WithCreate extends Creatable<ManagedDatabase>, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithStorageContainerSasToken, DefinitionStages.WithStorageContainerUri, DefinitionStages.WithTags {
         }
     }
     /**
      * The template for a ManagedDatabase update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<ManagedDatabase>, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithRestorePointInTime, UpdateStages.WithSourceDatabaseId, UpdateStages.WithStorageContainerSasToken, UpdateStages.WithStorageContainerUri, UpdateStages.WithTags {
+    interface Update extends Appliable<ManagedDatabase>, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSourceDatabaseId, UpdateStages.WithStorageContainerSasToken, UpdateStages.WithStorageContainerUri, UpdateStages.WithTags {
     }
 
     /**
@@ -294,12 +328,36 @@ interface WithCollation {
         interface WithCreateMode {
             /**
              * Specifies createMode.
-             * @param createMode Managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'
+             * @param createMode Managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Recovery: Creates a database by restoring a geo-replicated backup. RecoverableDatabaseId must be specified as the recoverable database resource ID to restore. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore', 'Recovery'
              * @return the next update stage
              */
             Update withCreateMode(ManagedDatabaseCreateMode createMode);
         }
 
+        /**
+         * The stage of the manageddatabase update allowing to specify RecoverableDatabaseId.
+         */
+        interface WithRecoverableDatabaseId {
+            /**
+             * Specifies recoverableDatabaseId.
+             * @param recoverableDatabaseId The resource identifier of the recoverable database associated with create operation of this database
+             * @return the next update stage
+             */
+            Update withRecoverableDatabaseId(String recoverableDatabaseId);
+        }
+
+        /**
+         * The stage of the manageddatabase update allowing to specify RestorableDroppedDatabaseId.
+         */
+        interface WithRestorableDroppedDatabaseId {
+            /**
+             * Specifies restorableDroppedDatabaseId.
+             * @param restorableDroppedDatabaseId The restorable dropped database resource id to restore when creating this database
+             * @return the next update stage
+             */
+            Update withRestorableDroppedDatabaseId(String restorableDroppedDatabaseId);
+        }
+
         /**
          * The stage of the manageddatabase update allowing to specify RestorePointInTime.
          */
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseCreateMode.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseCreateMode.java
index 401fce50ffa2..f54d0ace4220 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseCreateMode.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseCreateMode.java
@@ -25,6 +25,9 @@ public final class ManagedDatabaseCreateMode extends ExpandableStringEnum<Manage
     /** Static value PointInTimeRestore for ManagedDatabaseCreateMode. */
     public static final ManagedDatabaseCreateMode POINT_IN_TIME_RESTORE = fromString("PointInTimeRestore");
 
+    /** Static value Recovery for ManagedDatabaseCreateMode. */
+    public static final ManagedDatabaseCreateMode RECOVERY = fromString("Recovery");
+
     /**
      * Creates or finds a ManagedDatabaseCreateMode from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseSecurityAlertPolicies.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseSecurityAlertPolicies.java
new file mode 100644
index 000000000000..f47bedd0ba66
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseSecurityAlertPolicies.java
@@ -0,0 +1,42 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.ManagedDatabaseSecurityAlertPoliciesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ManagedDatabaseSecurityAlertPolicies.
+ */
+public interface ManagedDatabaseSecurityAlertPolicies extends SupportsCreating<ManagedDatabaseSecurityAlertPolicy.DefinitionStages.Blank>, HasInner<ManagedDatabaseSecurityAlertPoliciesInner> {
+    /**
+     * Gets a managed database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedDatabaseSecurityAlertPolicy> getAsync(String resourceGroupName, String managedInstanceName, String databaseName);
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policies are defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedDatabaseSecurityAlertPolicy> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName);
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseSecurityAlertPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseSecurityAlertPolicy.java
new file mode 100644
index 000000000000..12884a222ed9
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseSecurityAlertPolicy.java
@@ -0,0 +1,287 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.ManagedDatabaseSecurityAlertPolicyInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+import java.util.List;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing ManagedDatabaseSecurityAlertPolicy.
+ */
+public interface ManagedDatabaseSecurityAlertPolicy extends HasInner<ManagedDatabaseSecurityAlertPolicyInner>, Indexable, Refreshable<ManagedDatabaseSecurityAlertPolicy>, Updatable<ManagedDatabaseSecurityAlertPolicy.Update>, HasManager<SqlManager> {
+    /**
+     * @return the creationTime value.
+     */
+    DateTime creationTime();
+
+    /**
+     * @return the disabledAlerts value.
+     */
+    List<String> disabledAlerts();
+
+    /**
+     * @return the emailAccountAdmins value.
+     */
+    Boolean emailAccountAdmins();
+
+    /**
+     * @return the emailAddresses value.
+     */
+    List<String> emailAddresses();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the retentionDays value.
+     */
+    Integer retentionDays();
+
+    /**
+     * @return the state value.
+     */
+    SecurityAlertPolicyState state();
+
+    /**
+     * @return the storageAccountAccessKey value.
+     */
+    String storageAccountAccessKey();
+
+    /**
+     * @return the storageEndpoint value.
+     */
+    String storageEndpoint();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ManagedDatabaseSecurityAlertPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithDatabasis, DefinitionStages.WithState, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ManagedDatabaseSecurityAlertPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ManagedDatabaseSecurityAlertPolicy definition.
+         */
+        interface Blank extends WithDatabasis {
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify Databasis.
+         */
+        interface WithDatabasis {
+           /**
+            * Specifies resourceGroupName, managedInstanceName, databaseName.
+            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param managedInstanceName The name of the managed instance
+            * @param databaseName The name of the managed database for which the security alert policy is defined
+            * @return the next definition stage
+            */
+            WithState withExistingDatabasis(String resourceGroupName, String managedInstanceName, String databaseName);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify State.
+         */
+        interface WithState {
+           /**
+            * Specifies state.
+            * @param state Specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'
+            * @return the next definition stage
+            */
+            WithCreate withState(SecurityAlertPolicyState state);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify DisabledAlerts.
+         */
+        interface WithDisabledAlerts {
+            /**
+             * Specifies disabledAlerts.
+             * @param disabledAlerts Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action
+             * @return the next definition stage
+             */
+            WithCreate withDisabledAlerts(List<String> disabledAlerts);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify EmailAccountAdmins.
+         */
+        interface WithEmailAccountAdmins {
+            /**
+             * Specifies emailAccountAdmins.
+             * @param emailAccountAdmins Specifies that the alert is sent to the account administrators
+             * @return the next definition stage
+             */
+            WithCreate withEmailAccountAdmins(Boolean emailAccountAdmins);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify EmailAddresses.
+         */
+        interface WithEmailAddresses {
+            /**
+             * Specifies emailAddresses.
+             * @param emailAddresses Specifies an array of e-mail addresses to which the alert is sent
+             * @return the next definition stage
+             */
+            WithCreate withEmailAddresses(List<String> emailAddresses);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+            /**
+             * Specifies retentionDays.
+             * @param retentionDays Specifies the number of days to keep in the Threat Detection audit logs
+             * @return the next definition stage
+             */
+            WithCreate withRetentionDays(Integer retentionDays);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify StorageAccountAccessKey.
+         */
+        interface WithStorageAccountAccessKey {
+            /**
+             * Specifies storageAccountAccessKey.
+             * @param storageAccountAccessKey Specifies the identifier key of the Threat Detection audit storage account
+             * @return the next definition stage
+             */
+            WithCreate withStorageAccountAccessKey(String storageAccountAccessKey);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy definition allowing to specify StorageEndpoint.
+         */
+        interface WithStorageEndpoint {
+            /**
+             * Specifies storageEndpoint.
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs
+             * @return the next definition stage
+             */
+            WithCreate withStorageEndpoint(String storageEndpoint);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<ManagedDatabaseSecurityAlertPolicy>, DefinitionStages.WithDisabledAlerts, DefinitionStages.WithEmailAccountAdmins, DefinitionStages.WithEmailAddresses, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageEndpoint {
+        }
+    }
+    /**
+     * The template for a ManagedDatabaseSecurityAlertPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ManagedDatabaseSecurityAlertPolicy>, UpdateStages.WithDisabledAlerts, UpdateStages.WithEmailAccountAdmins, UpdateStages.WithEmailAddresses, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageEndpoint {
+    }
+
+    /**
+     * Grouping of ManagedDatabaseSecurityAlertPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy update allowing to specify DisabledAlerts.
+         */
+        interface WithDisabledAlerts {
+            /**
+             * Specifies disabledAlerts.
+             * @param disabledAlerts Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action
+             * @return the next update stage
+             */
+            Update withDisabledAlerts(List<String> disabledAlerts);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy update allowing to specify EmailAccountAdmins.
+         */
+        interface WithEmailAccountAdmins {
+            /**
+             * Specifies emailAccountAdmins.
+             * @param emailAccountAdmins Specifies that the alert is sent to the account administrators
+             * @return the next update stage
+             */
+            Update withEmailAccountAdmins(Boolean emailAccountAdmins);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy update allowing to specify EmailAddresses.
+         */
+        interface WithEmailAddresses {
+            /**
+             * Specifies emailAddresses.
+             * @param emailAddresses Specifies an array of e-mail addresses to which the alert is sent
+             * @return the next update stage
+             */
+            Update withEmailAddresses(List<String> emailAddresses);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy update allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+            /**
+             * Specifies retentionDays.
+             * @param retentionDays Specifies the number of days to keep in the Threat Detection audit logs
+             * @return the next update stage
+             */
+            Update withRetentionDays(Integer retentionDays);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy update allowing to specify StorageAccountAccessKey.
+         */
+        interface WithStorageAccountAccessKey {
+            /**
+             * Specifies storageAccountAccessKey.
+             * @param storageAccountAccessKey Specifies the identifier key of the Threat Detection audit storage account
+             * @return the next update stage
+             */
+            Update withStorageAccountAccessKey(String storageAccountAccessKey);
+        }
+
+        /**
+         * The stage of the manageddatabasesecurityalertpolicy update allowing to specify StorageEndpoint.
+         */
+        interface WithStorageEndpoint {
+            /**
+             * Specifies storageEndpoint.
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs
+             * @return the next update stage
+             */
+            Update withStorageEndpoint(String storageEndpoint);
+        }
+
+    }
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseStatus.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseStatus.java
index 6c1711fbaa13..e6d092993e91 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseStatus.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseStatus.java
@@ -31,6 +31,9 @@ public final class ManagedDatabaseStatus extends ExpandableStringEnum<ManagedDat
     /** Static value Inaccessible for ManagedDatabaseStatus. */
     public static final ManagedDatabaseStatus INACCESSIBLE = fromString("Inaccessible");
 
+    /** Static value Updating for ManagedDatabaseStatus. */
+    public static final ManagedDatabaseStatus UPDATING = fromString("Updating");
+
     /**
      * Creates or finds a ManagedDatabaseStatus from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseUpdate.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseUpdate.java
index 5e97692aaf11..13d2b856e523 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseUpdate.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabaseUpdate.java
@@ -25,8 +25,8 @@ public class ManagedDatabaseUpdate {
     private String collation;
 
     /**
-     * Status for the database. Possible values include: 'Online', 'Offline',
-     * 'Shutdown', 'Creating', 'Inaccessible'.
+     * Status of the database. Possible values include: 'Online', 'Offline',
+     * 'Shutdown', 'Creating', 'Inaccessible', 'Updating'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private ManagedDatabaseStatus status;
@@ -70,8 +70,11 @@ public class ManagedDatabaseUpdate {
      * SourceDatabaseName, SourceManagedInstanceName and PointInTime must be
      * specified. RestoreExternalBackup: Create a database by restoring from
      * external backup files. Collation, StorageContainerUri and
-     * StorageContainerSasToken must be specified. Possible values include:
-     * 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'.
+     * StorageContainerSasToken must be specified. Recovery: Creates a database
+     * by restoring a geo-replicated backup. RecoverableDatabaseId must be
+     * specified as the recoverable database resource ID to restore. Possible
+     * values include: 'Default', 'RestoreExternalBackup',
+     * 'PointInTimeRestore', 'Recovery'.
      */
     @JsonProperty(value = "properties.createMode")
     private ManagedDatabaseCreateMode createMode;
@@ -91,6 +94,13 @@ public class ManagedDatabaseUpdate {
     @JsonProperty(value = "properties.sourceDatabaseId")
     private String sourceDatabaseId;
 
+    /**
+     * The restorable dropped database resource id to restore when creating
+     * this database.
+     */
+    @JsonProperty(value = "properties.restorableDroppedDatabaseId")
+    private String restorableDroppedDatabaseId;
+
     /**
      * Conditional. If createMode is RestoreExternalBackup, this value is
      * required. Specifies the storage container sas token.
@@ -105,6 +115,13 @@ public class ManagedDatabaseUpdate {
     @JsonProperty(value = "properties.failoverGroupId", access = JsonProperty.Access.WRITE_ONLY)
     private String failoverGroupId;
 
+    /**
+     * The resource identifier of the recoverable database associated with
+     * create operation of this database.
+     */
+    @JsonProperty(value = "properties.recoverableDatabaseId")
+    private String recoverableDatabaseId;
+
     /**
      * Resource tags.
      */
@@ -132,7 +149,7 @@ public ManagedDatabaseUpdate withCollation(String collation) {
     }
 
     /**
-     * Get status for the database. Possible values include: 'Online', 'Offline', 'Shutdown', 'Creating', 'Inaccessible'.
+     * Get status of the database. Possible values include: 'Online', 'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Updating'.
      *
      * @return the status value
      */
@@ -208,7 +225,7 @@ public ManagedDatabaseUpdate withCatalogCollation(CatalogCollationType catalogCo
     }
 
     /**
-     * Get managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'.
+     * Get managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Recovery: Creates a database by restoring a geo-replicated backup. RecoverableDatabaseId must be specified as the recoverable database resource ID to restore. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore', 'Recovery'.
      *
      * @return the createMode value
      */
@@ -217,7 +234,7 @@ public ManagedDatabaseCreateMode createMode() {
     }
 
     /**
-     * Set managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'.
+     * Set managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Recovery: Creates a database by restoring a geo-replicated backup. RecoverableDatabaseId must be specified as the recoverable database resource ID to restore. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore', 'Recovery'.
      *
      * @param createMode the createMode value to set
      * @return the ManagedDatabaseUpdate object itself.
@@ -267,6 +284,26 @@ public ManagedDatabaseUpdate withSourceDatabaseId(String sourceDatabaseId) {
         return this;
     }
 
+    /**
+     * Get the restorable dropped database resource id to restore when creating this database.
+     *
+     * @return the restorableDroppedDatabaseId value
+     */
+    public String restorableDroppedDatabaseId() {
+        return this.restorableDroppedDatabaseId;
+    }
+
+    /**
+     * Set the restorable dropped database resource id to restore when creating this database.
+     *
+     * @param restorableDroppedDatabaseId the restorableDroppedDatabaseId value to set
+     * @return the ManagedDatabaseUpdate object itself.
+     */
+    public ManagedDatabaseUpdate withRestorableDroppedDatabaseId(String restorableDroppedDatabaseId) {
+        this.restorableDroppedDatabaseId = restorableDroppedDatabaseId;
+        return this;
+    }
+
     /**
      * Get conditional. If createMode is RestoreExternalBackup, this value is required. Specifies the storage container sas token.
      *
@@ -296,6 +333,26 @@ public String failoverGroupId() {
         return this.failoverGroupId;
     }
 
+    /**
+     * Get the resource identifier of the recoverable database associated with create operation of this database.
+     *
+     * @return the recoverableDatabaseId value
+     */
+    public String recoverableDatabaseId() {
+        return this.recoverableDatabaseId;
+    }
+
+    /**
+     * Set the resource identifier of the recoverable database associated with create operation of this database.
+     *
+     * @param recoverableDatabaseId the recoverableDatabaseId value to set
+     * @return the ManagedDatabaseUpdate object itself.
+     */
+    public ManagedDatabaseUpdate withRecoverableDatabaseId(String recoverableDatabaseId) {
+        this.recoverableDatabaseId = recoverableDatabaseId;
+        return this;
+    }
+
     /**
      * Get resource tags.
      *
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabases.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabases.java
index 9547e9bcf166..7a8f805685eb 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabases.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedDatabases.java
@@ -46,7 +46,7 @@ public interface ManagedDatabases {
     Observable<ManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedInstanceAdministrator.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedInstanceAdministrator.java
new file mode 100644
index 000000000000..027ae2ddc4f6
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedInstanceAdministrator.java
@@ -0,0 +1,169 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.ManagedInstanceAdministratorInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+import java.util.UUID;
+
+/**
+ * Type representing ManagedInstanceAdministrator.
+ */
+public interface ManagedInstanceAdministrator extends HasInner<ManagedInstanceAdministratorInner>, Indexable, Refreshable<ManagedInstanceAdministrator>, Updatable<ManagedInstanceAdministrator.Update>, HasManager<SqlManager> {
+    /**
+     * @return the administratorType value.
+     */
+    String administratorType();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the login value.
+     */
+    String login();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the sid value.
+     */
+    UUID sid();
+
+    /**
+     * @return the tenantId value.
+     */
+    UUID tenantId();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ManagedInstanceAdministrator definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagedInstance, DefinitionStages.WithAdministratorType, DefinitionStages.WithLogin, DefinitionStages.WithSid, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ManagedInstanceAdministrator definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ManagedInstanceAdministrator definition.
+         */
+        interface Blank extends WithManagedInstance {
+        }
+
+        /**
+         * The stage of the managedinstanceadministrator definition allowing to specify ManagedInstance.
+         */
+        interface WithManagedInstance {
+           /**
+            * Specifies resourceGroupName, managedInstanceName.
+            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param managedInstanceName The name of the managed instance
+            * @return the next definition stage
+            */
+            WithAdministratorType withExistingManagedInstance(String resourceGroupName, String managedInstanceName);
+        }
+
+        /**
+         * The stage of the managedinstanceadministrator definition allowing to specify AdministratorType.
+         */
+        interface WithAdministratorType {
+           /**
+            * Specifies administratorType.
+            * @param administratorType Type of the managed instance administrator
+            * @return the next definition stage
+            */
+            WithLogin withAdministratorType(String administratorType);
+        }
+
+        /**
+         * The stage of the managedinstanceadministrator definition allowing to specify Login.
+         */
+        interface WithLogin {
+           /**
+            * Specifies login.
+            * @param login Login name of the managed instance administrator
+            * @return the next definition stage
+            */
+            WithSid withLogin(String login);
+        }
+
+        /**
+         * The stage of the managedinstanceadministrator definition allowing to specify Sid.
+         */
+        interface WithSid {
+           /**
+            * Specifies sid.
+            * @param sid SID (object ID) of the managed instance administrator
+            * @return the next definition stage
+            */
+            WithCreate withSid(UUID sid);
+        }
+
+        /**
+         * The stage of the managedinstanceadministrator definition allowing to specify TenantId.
+         */
+        interface WithTenantId {
+            /**
+             * Specifies tenantId.
+             * @param tenantId Tenant ID of the managed instance administrator
+             * @return the next definition stage
+             */
+            WithCreate withTenantId(UUID tenantId);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<ManagedInstanceAdministrator>, DefinitionStages.WithTenantId {
+        }
+    }
+    /**
+     * The template for a ManagedInstanceAdministrator update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ManagedInstanceAdministrator>, UpdateStages.WithTenantId {
+    }
+
+    /**
+     * Grouping of ManagedInstanceAdministrator update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the managedinstanceadministrator update allowing to specify TenantId.
+         */
+        interface WithTenantId {
+            /**
+             * Specifies tenantId.
+             * @param tenantId Tenant ID of the managed instance administrator
+             * @return the next update stage
+             */
+            Update withTenantId(UUID tenantId);
+        }
+
+    }
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedInstanceAdministrators.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedInstanceAdministrators.java
new file mode 100644
index 000000000000..7667c1f68f64
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedInstanceAdministrators.java
@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrator;
+import rx.Completable;
+
+/**
+ * Type representing ManagedInstanceAdministrators.
+ */
+public interface ManagedInstanceAdministrators {
+    /**
+     * Begins definition for a new Administrator resource.
+     * @param name resource name.
+     * @return the first stage of the new Administrator definition.
+     */
+    ManagedInstanceAdministrator.DefinitionStages.Blank defineAdministrator(String name);
+
+    /**
+     * Gets a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedInstanceAdministrator> getAsync(String resourceGroupName, String managedInstanceName, String administratorName);
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedInstanceAdministrator> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String managedInstanceName, String administratorName);
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies.java
new file mode 100644
index 000000000000..00b172538fad
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies.java
@@ -0,0 +1,42 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies.
+ */
+public interface ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies extends SupportsCreating<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.DefinitionStages.Blank>, HasInner<ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner> {
+    /**
+     * Gets a dropped database's short term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId);
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> listByRestorableDroppedDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String restorableDroppedDatabaseId);
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedServerSecurityAlertPolicies.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedServerSecurityAlertPolicies.java
new file mode 100644
index 000000000000..6e512daa8892
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedServerSecurityAlertPolicies.java
@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicy;
+
+/**
+ * Type representing ManagedServerSecurityAlertPolicies.
+ */
+public interface ManagedServerSecurityAlertPolicies {
+    /**
+     * Begins definition for a new SecurityAlertPolicy resource.
+     * @param name resource name.
+     * @return the first stage of the new SecurityAlertPolicy definition.
+     */
+    ManagedServerSecurityAlertPolicy.DefinitionStages.Blank defineSecurityAlertPolicy(String name);
+
+    /**
+     * Get a managed server's threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedServerSecurityAlertPolicy> getAsync(String resourceGroupName, String managedInstanceName);
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedServerSecurityAlertPolicy> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedServerSecurityAlertPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedServerSecurityAlertPolicy.java
new file mode 100644
index 000000000000..fafb3fd720f2
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ManagedServerSecurityAlertPolicy.java
@@ -0,0 +1,286 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.ManagedServerSecurityAlertPolicyInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+import java.util.List;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing ManagedServerSecurityAlertPolicy.
+ */
+public interface ManagedServerSecurityAlertPolicy extends HasInner<ManagedServerSecurityAlertPolicyInner>, Indexable, Refreshable<ManagedServerSecurityAlertPolicy>, Updatable<ManagedServerSecurityAlertPolicy.Update>, HasManager<SqlManager> {
+    /**
+     * @return the creationTime value.
+     */
+    DateTime creationTime();
+
+    /**
+     * @return the disabledAlerts value.
+     */
+    List<String> disabledAlerts();
+
+    /**
+     * @return the emailAccountAdmins value.
+     */
+    Boolean emailAccountAdmins();
+
+    /**
+     * @return the emailAddresses value.
+     */
+    List<String> emailAddresses();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the retentionDays value.
+     */
+    Integer retentionDays();
+
+    /**
+     * @return the state value.
+     */
+    SecurityAlertPolicyState state();
+
+    /**
+     * @return the storageAccountAccessKey value.
+     */
+    String storageAccountAccessKey();
+
+    /**
+     * @return the storageEndpoint value.
+     */
+    String storageEndpoint();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ManagedServerSecurityAlertPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagedInstance, DefinitionStages.WithState, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ManagedServerSecurityAlertPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ManagedServerSecurityAlertPolicy definition.
+         */
+        interface Blank extends WithManagedInstance {
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify ManagedInstance.
+         */
+        interface WithManagedInstance {
+           /**
+            * Specifies resourceGroupName, managedInstanceName.
+            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param managedInstanceName The name of the managed instance
+            * @return the next definition stage
+            */
+            WithState withExistingManagedInstance(String resourceGroupName, String managedInstanceName);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify State.
+         */
+        interface WithState {
+           /**
+            * Specifies state.
+            * @param state Specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'
+            * @return the next definition stage
+            */
+            WithCreate withState(SecurityAlertPolicyState state);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify DisabledAlerts.
+         */
+        interface WithDisabledAlerts {
+            /**
+             * Specifies disabledAlerts.
+             * @param disabledAlerts Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action
+             * @return the next definition stage
+             */
+            WithCreate withDisabledAlerts(List<String> disabledAlerts);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify EmailAccountAdmins.
+         */
+        interface WithEmailAccountAdmins {
+            /**
+             * Specifies emailAccountAdmins.
+             * @param emailAccountAdmins Specifies that the alert is sent to the account administrators
+             * @return the next definition stage
+             */
+            WithCreate withEmailAccountAdmins(Boolean emailAccountAdmins);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify EmailAddresses.
+         */
+        interface WithEmailAddresses {
+            /**
+             * Specifies emailAddresses.
+             * @param emailAddresses Specifies an array of e-mail addresses to which the alert is sent
+             * @return the next definition stage
+             */
+            WithCreate withEmailAddresses(List<String> emailAddresses);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+            /**
+             * Specifies retentionDays.
+             * @param retentionDays Specifies the number of days to keep in the Threat Detection audit logs
+             * @return the next definition stage
+             */
+            WithCreate withRetentionDays(Integer retentionDays);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify StorageAccountAccessKey.
+         */
+        interface WithStorageAccountAccessKey {
+            /**
+             * Specifies storageAccountAccessKey.
+             * @param storageAccountAccessKey Specifies the identifier key of the Threat Detection audit storage account
+             * @return the next definition stage
+             */
+            WithCreate withStorageAccountAccessKey(String storageAccountAccessKey);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy definition allowing to specify StorageEndpoint.
+         */
+        interface WithStorageEndpoint {
+            /**
+             * Specifies storageEndpoint.
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs
+             * @return the next definition stage
+             */
+            WithCreate withStorageEndpoint(String storageEndpoint);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<ManagedServerSecurityAlertPolicy>, DefinitionStages.WithDisabledAlerts, DefinitionStages.WithEmailAccountAdmins, DefinitionStages.WithEmailAddresses, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageEndpoint {
+        }
+    }
+    /**
+     * The template for a ManagedServerSecurityAlertPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ManagedServerSecurityAlertPolicy>, UpdateStages.WithDisabledAlerts, UpdateStages.WithEmailAccountAdmins, UpdateStages.WithEmailAddresses, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageEndpoint {
+    }
+
+    /**
+     * Grouping of ManagedServerSecurityAlertPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the managedserversecurityalertpolicy update allowing to specify DisabledAlerts.
+         */
+        interface WithDisabledAlerts {
+            /**
+             * Specifies disabledAlerts.
+             * @param disabledAlerts Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action
+             * @return the next update stage
+             */
+            Update withDisabledAlerts(List<String> disabledAlerts);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy update allowing to specify EmailAccountAdmins.
+         */
+        interface WithEmailAccountAdmins {
+            /**
+             * Specifies emailAccountAdmins.
+             * @param emailAccountAdmins Specifies that the alert is sent to the account administrators
+             * @return the next update stage
+             */
+            Update withEmailAccountAdmins(Boolean emailAccountAdmins);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy update allowing to specify EmailAddresses.
+         */
+        interface WithEmailAddresses {
+            /**
+             * Specifies emailAddresses.
+             * @param emailAddresses Specifies an array of e-mail addresses to which the alert is sent
+             * @return the next update stage
+             */
+            Update withEmailAddresses(List<String> emailAddresses);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy update allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+            /**
+             * Specifies retentionDays.
+             * @param retentionDays Specifies the number of days to keep in the Threat Detection audit logs
+             * @return the next update stage
+             */
+            Update withRetentionDays(Integer retentionDays);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy update allowing to specify StorageAccountAccessKey.
+         */
+        interface WithStorageAccountAccessKey {
+            /**
+             * Specifies storageAccountAccessKey.
+             * @param storageAccountAccessKey Specifies the identifier key of the Threat Detection audit storage account
+             * @return the next update stage
+             */
+            Update withStorageAccountAccessKey(String storageAccountAccessKey);
+        }
+
+        /**
+         * The stage of the managedserversecurityalertpolicy update allowing to specify StorageEndpoint.
+         */
+        interface WithStorageEndpoint {
+            /**
+             * Specifies storageEndpoint.
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs
+             * @return the next update stage
+             */
+            Update withStorageEndpoint(String storageEndpoint);
+        }
+
+    }
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RecommendedSensitivityLabels.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RecommendedSensitivityLabels.java
new file mode 100644
index 000000000000..8781026c7a22
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RecommendedSensitivityLabels.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.RecommendedSensitivityLabelsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RecommendedSensitivityLabels.
+ */
+public interface RecommendedSensitivityLabels extends HasInner<RecommendedSensitivityLabelsInner> {
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DatabasisServerSensitivityLabelModel> listByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName);
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.java
new file mode 100644
index 000000000000..92c0e2d721d7
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.java
@@ -0,0 +1,118 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.ManagedBackupShortTermRetentionPolicyInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.
+ */
+public interface RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy extends HasInner<ManagedBackupShortTermRetentionPolicyInner>, Indexable, Refreshable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>, Updatable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.Update>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the retentionDays value.
+     */
+    Integer retentionDays();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithRestorableDroppedDatabasis, DefinitionStages.WithRetentionDays, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy definition.
+         */
+        interface Blank extends WithRestorableDroppedDatabasis {
+        }
+
+        /**
+         * The stage of the restorabledroppeddatabasismanagedinstancemanagedbackupshorttermretentionpolicy definition allowing to specify RestorableDroppedDatabasis.
+         */
+        interface WithRestorableDroppedDatabasis {
+           /**
+            * Specifies resourceGroupName, managedInstanceName, restorableDroppedDatabaseId.
+            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param managedInstanceName The name of the managed instance
+            * @param restorableDroppedDatabaseId the restorableDroppedDatabaseId parameter value
+            * @return the next definition stage
+            */
+            WithRetentionDays withExistingRestorableDroppedDatabasis(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId);
+        }
+
+        /**
+         * The stage of the restorabledroppeddatabasismanagedinstancemanagedbackupshorttermretentionpolicy definition allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+           /**
+            * Specifies retentionDays.
+            * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported
+            * @return the next definition stage
+            */
+            WithCreate withRetentionDays(Integer retentionDays);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> {
+        }
+    }
+    /**
+     * The template for a RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>, UpdateStages.WithRetentionDays {
+    }
+
+    /**
+     * Grouping of RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the restorabledroppeddatabasismanagedinstancemanagedbackupshorttermretentionpolicy update allowing to specify RetentionDays.
+         */
+        interface WithRetentionDays {
+            /**
+             * Specifies retentionDays.
+             * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported
+             * @return the next update stage
+             */
+            Update withRetentionDays(Integer retentionDays);
+        }
+
+    }
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedManagedDatabase.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedManagedDatabase.java
new file mode 100644
index 000000000000..d08e30ec738c
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedManagedDatabase.java
@@ -0,0 +1,69 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.RestorableDroppedManagedDatabaseInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+import org.joda.time.DateTime;
+import java.util.Map;
+
+/**
+ * Type representing RestorableDroppedManagedDatabase.
+ */
+public interface RestorableDroppedManagedDatabase extends HasInner<RestorableDroppedManagedDatabaseInner>, Indexable, Refreshable<RestorableDroppedManagedDatabase>, HasManager<SqlManager> {
+    /**
+     * @return the creationDate value.
+     */
+    DateTime creationDate();
+
+    /**
+     * @return the databaseName value.
+     */
+    String databaseName();
+
+    /**
+     * @return the deletionDate value.
+     */
+    DateTime deletionDate();
+
+    /**
+     * @return the earliestRestoreDate value.
+     */
+    DateTime earliestRestoreDate();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedManagedDatabases.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedManagedDatabases.java
new file mode 100644
index 000000000000..0926d20816de
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/RestorableDroppedManagedDatabases.java
@@ -0,0 +1,39 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabase;
+
+/**
+ * Type representing RestorableDroppedManagedDatabases.
+ */
+public interface RestorableDroppedManagedDatabases {
+    /**
+     * Gets a restorable dropped managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RestorableDroppedManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId);
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RestorableDroppedManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabel.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabel.java
new file mode 100644
index 000000000000..39f1024e1557
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabel.java
@@ -0,0 +1,213 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SensitivityLabelInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing SensitivityLabel.
+ */
+public interface SensitivityLabel extends HasInner<SensitivityLabelInner>, Indexable, Refreshable<SensitivityLabel>, Updatable<SensitivityLabel.Update>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the informationType value.
+     */
+    String informationType();
+
+    /**
+     * @return the informationTypeId value.
+     */
+    String informationTypeId();
+
+    /**
+     * @return the isDisabled value.
+     */
+    Boolean isDisabled();
+
+    /**
+     * @return the labelId value.
+     */
+    String labelId();
+
+    /**
+     * @return the labelName value.
+     */
+    String labelName();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the SensitivityLabel definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithColumn, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of SensitivityLabel definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a SensitivityLabel definition.
+         */
+        interface Blank extends WithColumn {
+        }
+
+        /**
+         * The stage of the sensitivitylabel definition allowing to specify Column.
+         */
+        interface WithColumn {
+           /**
+            * Specifies resourceGroupName, serverName, databaseName, schemaName, tableName, columnName.
+            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param serverName The name of the server
+            * @param databaseName The name of the database
+            * @param schemaName The name of the schema
+            * @param tableName The name of the table
+            * @param columnName The name of the column
+            * @return the next definition stage
+            */
+            WithCreate withExistingColumn(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName);
+        }
+
+        /**
+         * The stage of the sensitivitylabel definition allowing to specify InformationType.
+         */
+        interface WithInformationType {
+            /**
+             * Specifies informationType.
+             * @param informationType The information type
+             * @return the next definition stage
+             */
+            WithCreate withInformationType(String informationType);
+        }
+
+        /**
+         * The stage of the sensitivitylabel definition allowing to specify InformationTypeId.
+         */
+        interface WithInformationTypeId {
+            /**
+             * Specifies informationTypeId.
+             * @param informationTypeId The information type ID
+             * @return the next definition stage
+             */
+            WithCreate withInformationTypeId(String informationTypeId);
+        }
+
+        /**
+         * The stage of the sensitivitylabel definition allowing to specify LabelId.
+         */
+        interface WithLabelId {
+            /**
+             * Specifies labelId.
+             * @param labelId The label ID
+             * @return the next definition stage
+             */
+            WithCreate withLabelId(String labelId);
+        }
+
+        /**
+         * The stage of the sensitivitylabel definition allowing to specify LabelName.
+         */
+        interface WithLabelName {
+            /**
+             * Specifies labelName.
+             * @param labelName The label name
+             * @return the next definition stage
+             */
+            WithCreate withLabelName(String labelName);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<SensitivityLabel>, DefinitionStages.WithInformationType, DefinitionStages.WithInformationTypeId, DefinitionStages.WithLabelId, DefinitionStages.WithLabelName {
+        }
+    }
+    /**
+     * The template for a SensitivityLabel update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<SensitivityLabel>, UpdateStages.WithInformationType, UpdateStages.WithInformationTypeId, UpdateStages.WithLabelId, UpdateStages.WithLabelName {
+    }
+
+    /**
+     * Grouping of SensitivityLabel update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the sensitivitylabel update allowing to specify InformationType.
+         */
+        interface WithInformationType {
+            /**
+             * Specifies informationType.
+             * @param informationType The information type
+             * @return the next update stage
+             */
+            Update withInformationType(String informationType);
+        }
+
+        /**
+         * The stage of the sensitivitylabel update allowing to specify InformationTypeId.
+         */
+        interface WithInformationTypeId {
+            /**
+             * Specifies informationTypeId.
+             * @param informationTypeId The information type ID
+             * @return the next update stage
+             */
+            Update withInformationTypeId(String informationTypeId);
+        }
+
+        /**
+         * The stage of the sensitivitylabel update allowing to specify LabelId.
+         */
+        interface WithLabelId {
+            /**
+             * Specifies labelId.
+             * @param labelId The label ID
+             * @return the next update stage
+             */
+            Update withLabelId(String labelId);
+        }
+
+        /**
+         * The stage of the sensitivitylabel update allowing to specify LabelName.
+         */
+        interface WithLabelName {
+            /**
+             * Specifies labelName.
+             * @param labelName The label name
+             * @return the next update stage
+             */
+            Update withLabelName(String labelName);
+        }
+
+    }
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabelSource.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabelSource.java
new file mode 100644
index 000000000000..436333e89dae
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabelSource.java
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for SensitivityLabelSource.
+ */
+public enum SensitivityLabelSource {
+    /** Enum value current. */
+    CURRENT("current"),
+
+    /** Enum value recommended. */
+    RECOMMENDED("recommended");
+
+    /** The actual serialized value for a SensitivityLabelSource instance. */
+    private String value;
+
+    SensitivityLabelSource(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a SensitivityLabelSource instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed SensitivityLabelSource object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static SensitivityLabelSource fromString(String value) {
+        SensitivityLabelSource[] items = SensitivityLabelSource.values();
+        for (SensitivityLabelSource item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabels.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabels.java
new file mode 100644
index 000000000000..c22a0cc12b3c
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/SensitivityLabels.java
@@ -0,0 +1,90 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SensitivityLabelsInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabasisServerSensitivityLabel;
+
+/**
+ * Type representing SensitivityLabels.
+ */
+public interface SensitivityLabels extends SupportsCreating<SensitivityLabel.DefinitionStages.Blank>, HasInner<SensitivityLabelsInner> {
+    /**
+     * Enables sensitivity recommendations on a given column (recommendations are enabled by default on all columns).
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable enableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName);
+
+    /**
+     * Disables sensitivity recommendations on a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable disableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName);
+
+    /**
+     * Gets the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param sensitivityLabelSource The source of the sensitivity label. Possible values include: 'current', 'recommended'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SensitivityLabel> getAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelSource sensitivityLabelSource);
+
+    /**
+     * Deletes the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName);
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DatabasisServerSensitivityLabel> listCurrentByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName);
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerBlobAuditingPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerBlobAuditingPolicy.java
index 069f7c05c416..c7b80116c48b 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerBlobAuditingPolicy.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerBlobAuditingPolicy.java
@@ -183,7 +183,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
@@ -336,7 +336,7 @@ interface WithIsAzureMonitorTargetEnabled {
             /**
              * Specifies isAzureMonitorTargetEnabled.
              * @param isAzureMonitorTargetEnabled Specifies whether audit events are sent to Azure Monitor.
- In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+ In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
  When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
  Note that for server level audit you should use the 'master' database as {databaseName}.
  Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicies.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicies.java
index f27795c42361..301726190861 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicies.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicies.java
@@ -27,4 +27,14 @@ public interface ServerSecurityAlertPolicies extends SupportsCreating<ServerSecu
      */
     Observable<ServerSecurityAlertPolicy> getAsync(String resourceGroupName, String serverName);
 
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ServerSecurityAlertPolicy> listByServerAsync(final String resourceGroupName, final String serverName);
+
 }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicy.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicy.java
index 7d819c8d9594..a8dceeb2adf8 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicy.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ServerSecurityAlertPolicy.java
@@ -18,11 +18,17 @@
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.implementation.SqlManager;
 import java.util.List;
+import org.joda.time.DateTime;
 
 /**
  * Type representing ServerSecurityAlertPolicy.
  */
 public interface ServerSecurityAlertPolicy extends HasInner<ServerSecurityAlertPolicyInner>, Indexable, Refreshable<ServerSecurityAlertPolicy>, Updatable<ServerSecurityAlertPolicy.Update>, HasManager<SqlManager> {
+    /**
+     * @return the creationTime value.
+     */
+    DateTime creationTime();
+
     /**
      * @return the disabledAlerts value.
      */
@@ -108,7 +114,7 @@ interface WithServer {
         interface WithState {
            /**
             * Specifies state.
-            * @param state Specifies the state of the policy, whether it is enabled or disabled. Possible values include: 'New', 'Enabled', 'Disabled'
+            * @param state Specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'
             * @return the next definition stage
             */
             WithCreate withState(SecurityAlertPolicyState state);
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseBlobAuditingPolicyInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseBlobAuditingPolicyInner.java
index 1ed33eee12be..dc9f0fde563f 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseBlobAuditingPolicyInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseBlobAuditingPolicyInner.java
@@ -148,8 +148,8 @@ public class DatabaseBlobAuditingPolicyInner extends ProxyResource {
 
     /**
      * Specifies whether audit events are sent to Azure Monitor.
-     * In order to send the events to Azure Monitor, specify 'State' as
-     * 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     * In order to send the events to Azure Monitor, specify 'state' as
+     * 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      *
      * When using REST API to configure auditing, Diagnostic Settings with
      * 'SQLSecurityAuditEvents' diagnostic logs category on the database should
@@ -408,7 +408,7 @@ public DatabaseBlobAuditingPolicyInner withIsStorageSecondaryKeyInUse(Boolean is
 
     /**
      * Get specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
@@ -424,7 +424,7 @@ public Boolean isAzureMonitorTargetEnabled() {
 
     /**
      * Set specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
index 6e65b17864b3..023610ad1fa2 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
@@ -29,7 +29,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(name, new DatabaseVulnerabilityAssessmentRuleBaselineInner());
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(name);
+        this.baselineName = name;
         //
     }
 
@@ -37,7 +37,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(inner.name());
+        this.baselineName = inner.name();
         // set resource ancestor and positional variables
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.serverName = IdParsingUtils.getValueFromIdByName(inner.id(), "servers");
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselinesImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
index 09c6ce15a1d1..468a1f0c9002 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
@@ -11,7 +11,6 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabaseVulnerabilityAssessmentRuleBaselines;
-import com.microsoft.azure.management.sql.v2017_03_01_preview.VulnerabilityAssessmentPolicyBaselineName;
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabaseVulnerabilityAssessmentRuleBaseline;
@@ -47,7 +46,7 @@ private Observable<DatabaseVulnerabilityAssessmentRuleBaselineInner> getDatabase
         String serverName = IdParsingUtils.getValueFromIdByName(id, "servers");
         String databaseName = IdParsingUtils.getValueFromIdByName(id, "databases");
         String ruleId = IdParsingUtils.getValueFromIdByName(id, "rules");
-        VulnerabilityAssessmentPolicyBaselineName baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
+        String baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
         DatabaseVulnerabilityAssessmentRuleBaselinesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, databaseName, ruleId, baselineName);
     }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl.java
new file mode 100644
index 000000000000..45af884ced1d
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl.java
@@ -0,0 +1,112 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+
+class DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl extends CreatableUpdatableImpl<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy, ManagedBackupShortTermRetentionPolicyInner, DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl> implements DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy, DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.Definition, DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.Update {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String databaseName;
+    private Integer cretentionDays;
+    private Integer uretentionDays;
+
+    DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(String name, SqlManager manager) {
+        super(name, new ManagedBackupShortTermRetentionPolicyInner());
+        this.manager = manager;
+        // Set resource name
+        this.databaseName = name;
+        //
+    }
+
+    DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(ManagedBackupShortTermRetentionPolicyInner inner, SqlManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.databaseName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.databaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "databases");
+        //
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> createResourceAsync() {
+        ManagedBackupShortTermRetentionPoliciesInner client = this.manager().inner().managedBackupShortTermRetentionPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.databaseName, this.cretentionDays)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> updateResourceAsync() {
+        ManagedBackupShortTermRetentionPoliciesInner client = this.manager().inner().managedBackupShortTermRetentionPolicies();
+        return client.updateAsync(this.resourceGroupName, this.managedInstanceName, this.databaseName, this.uretentionDays)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ManagedBackupShortTermRetentionPolicyInner> getInnerAsync() {
+        ManagedBackupShortTermRetentionPoliciesInner client = this.manager().inner().managedBackupShortTermRetentionPolicies();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.databaseName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer retentionDays() {
+        return this.inner().retentionDays();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl withExistingDatabasis(String resourceGroupName, String managedInstanceName, String databaseName) {
+        this.resourceGroupName = resourceGroupName;
+        this.managedInstanceName = managedInstanceName;
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    @Override
+    public DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl withRetentionDays(Integer retentionDays) {
+        if (isInCreateMode()) {
+            this.cretentionDays = retentionDays;
+        } else {
+            this.uretentionDays = retentionDays;
+        }
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisServerSensitivityLabelImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisServerSensitivityLabelImpl.java
new file mode 100644
index 000000000000..e2c221572a2d
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisServerSensitivityLabelImpl.java
@@ -0,0 +1,70 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabasisServerSensitivityLabel;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+
+class DatabasisServerSensitivityLabelImpl extends WrapperImpl<SensitivityLabelInner> implements DatabasisServerSensitivityLabel {
+    private final SqlManager manager;
+
+    DatabasisServerSensitivityLabelImpl(SensitivityLabelInner inner,  SqlManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String informationType() {
+        return this.inner().informationType();
+    }
+
+    @Override
+    public String informationTypeId() {
+        return this.inner().informationTypeId();
+    }
+
+    @Override
+    public Boolean isDisabled() {
+        return this.inner().isDisabled();
+    }
+
+    @Override
+    public String labelId() {
+        return this.inner().labelId();
+    }
+
+    @Override
+    public String labelName() {
+        return this.inner().labelName();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisServerSensitivityLabelModelImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisServerSensitivityLabelModelImpl.java
new file mode 100644
index 000000000000..6757d22ea454
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/DatabasisServerSensitivityLabelModelImpl.java
@@ -0,0 +1,70 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabasisServerSensitivityLabelModel;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+
+class DatabasisServerSensitivityLabelModelImpl extends WrapperImpl<SensitivityLabelInner> implements DatabasisServerSensitivityLabelModel {
+    private final SqlManager manager;
+
+    DatabasisServerSensitivityLabelModelImpl(SensitivityLabelInner inner,  SqlManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String informationType() {
+        return this.inner().informationType();
+    }
+
+    @Override
+    public String informationTypeId() {
+        return this.inner().informationTypeId();
+    }
+
+    @Override
+    public Boolean isDisabled() {
+        return this.inner().isDisabled();
+    }
+
+    @Override
+    public String labelId() {
+        return this.inner().labelId();
+    }
+
+    @Override
+    public String labelName() {
+        return this.inner().labelName();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedDatabaseBlobAuditingPolicyInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedDatabaseBlobAuditingPolicyInner.java
index 4da56c80b6d6..a7c294fea9d7 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedDatabaseBlobAuditingPolicyInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedDatabaseBlobAuditingPolicyInner.java
@@ -148,8 +148,8 @@ public class ExtendedDatabaseBlobAuditingPolicyInner extends ProxyResource {
 
     /**
      * Specifies whether audit events are sent to Azure Monitor.
-     * In order to send the events to Azure Monitor, specify 'State' as
-     * 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     * In order to send the events to Azure Monitor, specify 'state' as
+     * 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      *
      * When using REST API to configure auditing, Diagnostic Settings with
      * 'SQLSecurityAuditEvents' diagnostic logs category on the database should
@@ -419,7 +419,7 @@ public ExtendedDatabaseBlobAuditingPolicyInner withIsStorageSecondaryKeyInUse(Bo
 
     /**
      * Get specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
@@ -435,7 +435,7 @@ public Boolean isAzureMonitorTargetEnabled() {
 
     /**
      * Set specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedServerBlobAuditingPolicyInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedServerBlobAuditingPolicyInner.java
index c42417db23e1..415c84123878 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedServerBlobAuditingPolicyInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ExtendedServerBlobAuditingPolicyInner.java
@@ -148,8 +148,8 @@ public class ExtendedServerBlobAuditingPolicyInner extends ProxyResource {
 
     /**
      * Specifies whether audit events are sent to Azure Monitor.
-     * In order to send the events to Azure Monitor, specify 'State' as
-     * 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     * In order to send the events to Azure Monitor, specify 'state' as
+     * 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      *
      * When using REST API to configure auditing, Diagnostic Settings with
      * 'SQLSecurityAuditEvents' diagnostic logs category on the database should
@@ -419,7 +419,7 @@ public ExtendedServerBlobAuditingPolicyInner withIsStorageSecondaryKeyInUse(Bool
 
     /**
      * Get specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
@@ -435,7 +435,7 @@ public Boolean isAzureMonitorTargetEnabled() {
 
     /**
      * Set specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobAgentServerJobExecutionImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobAgentServerJobExecutionImpl.java
index 4e0e2e0cdc69..e6525639104e 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobAgentServerJobExecutionImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobAgentServerJobExecutionImpl.java
@@ -29,7 +29,7 @@ class JobAgentServerJobExecutionImpl extends CreatableUpdatableImpl<JobAgentServ
         super(name, new JobExecutionInner());
         this.manager = manager;
         // Set resource name
-        this.jobExecutionId = UUID.fromString(name);
+        this.jobExecutionId = name;
         //
     }
 
@@ -37,7 +37,7 @@ class JobAgentServerJobExecutionImpl extends CreatableUpdatableImpl<JobAgentServ
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.jobExecutionId = UUID.fromString(inner.name());
+        this.jobExecutionId = inner.name();
         // set resource ancestor and positional variables
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.serverName = IdParsingUtils.getValueFromIdByName(inner.id(), "servers");
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobExecutionsInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobExecutionsInner.java
index b697ccfe6a54..96e4cd7d9471 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobExecutionsInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobExecutionsInner.java
@@ -1111,7 +1111,7 @@ private ServiceResponse<JobExecutionInner> getDelegate(Response<ResponseBody> re
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
@@ -1128,7 +1128,7 @@ public JobExecutionInner createOrUpdate(String resourceGroupName, String serverN
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
@@ -1144,7 +1144,7 @@ public ServiceFuture<JobExecutionInner> createOrUpdateAsync(String resourceGroup
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
@@ -1164,7 +1164,7 @@ public JobExecutionInner call(ServiceResponse<JobExecutionInner> response) {
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
@@ -1201,7 +1201,7 @@ public Observable<ServiceResponse<JobExecutionInner>> createOrUpdateWithServiceR
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
@@ -1218,7 +1218,7 @@ public JobExecutionInner beginCreateOrUpdate(String resourceGroupName, String se
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
@@ -1234,7 +1234,7 @@ public ServiceFuture<JobExecutionInner> beginCreateOrUpdateAsync(String resource
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
@@ -1254,7 +1254,7 @@ public JobExecutionInner call(ServiceResponse<JobExecutionInner> response) {
     }
 
     /**
-     * Creates or updatess a job execution.
+     * Creates or updates a job execution.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serverName The name of the server.
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepExecutionsImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepExecutionsImpl.java
index 7c63052aaa15..8719fbbd0eb9 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepExecutionsImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepExecutionsImpl.java
@@ -16,8 +16,6 @@
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ExecutionJobJobAgentServerJobExecution;
 import com.microsoft.azure.Page;
 
-import java.util.UUID;
-
 class JobStepExecutionsImpl extends WrapperImpl<JobStepExecutionsInner> implements JobStepExecutions {
     private final SqlManager manager;
 
@@ -39,7 +37,7 @@ private Observable<JobExecutionInner> getJobExecutionInnerUsingJobStepExecutions
         String serverName = IdParsingUtils.getValueFromIdByName(id, "servers");
         String jobAgentName = IdParsingUtils.getValueFromIdByName(id, "jobAgents");
         String jobName = IdParsingUtils.getValueFromIdByName(id, "jobs");
-        UUID jobExecutionId = UUID.fromString(IdParsingUtils.getValueFromIdByName(id, "executions"));
+        String jobExecutionId = UUID.fromString(IdParsingUtils.getValueFromIdByName(id, "executions"));
         String stepName = IdParsingUtils.getValueFromIdByName(id, "steps");
         JobStepExecutionsInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, jobAgentName, jobName, jobExecutionId, stepName);
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepImpl.java
index 4c57c31d99fb..324af6f0ef57 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/JobStepImpl.java
@@ -67,7 +67,7 @@ public Observable<JobStep> updateResourceAsync() {
     @Override
     protected Observable<JobStepInner> getInnerAsync() {
         JobStepsInner client = this.manager().inner().jobSteps();
-        return client.getAsync(this.resourceGroupName, this.serverName, this.jobAgentName, this.jobName, this.stepName);
+        return client.getByVersionAsync(this.resourceGroupName, this.serverName, this.jobAgentName, this.jobName, this.stepName);
     }
 
     @Override
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupImpl.java
index 868999b12a5b..53f2b600d2e6 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupImpl.java
@@ -15,6 +15,7 @@
 
 class LongTermRetentionBackupImpl extends IndexableRefreshableWrapperImpl<LongTermRetentionBackup, LongTermRetentionBackupInner> implements LongTermRetentionBackup {
     private final SqlManager manager;
+    private String resourceGroupName;
     private String locationName;
     private String longTermRetentionServerName;
     private String longTermRetentionDatabaseName;
@@ -24,6 +25,7 @@ class LongTermRetentionBackupImpl extends IndexableRefreshableWrapperImpl<LongTe
         super(null, inner);
         this.manager = manager;
         // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.locationName = IdParsingUtils.getValueFromIdByName(inner.id(), "locations");
         this.longTermRetentionServerName = IdParsingUtils.getValueFromIdByName(inner.id(), "longTermRetentionServers");
         this.longTermRetentionDatabaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "longTermRetentionDatabases");
@@ -38,7 +40,7 @@ public SqlManager manager() {
     @Override
     protected Observable<LongTermRetentionBackupInner> getInnerAsync() {
         LongTermRetentionBackupsInner client = this.manager().inner().longTermRetentionBackups();
-        return client.getAsync(this.locationName, this.longTermRetentionServerName, this.longTermRetentionDatabaseName, this.backupName);
+        return client.getByResourceGroupAsync(this.resourceGroupName, this.locationName, this.longTermRetentionServerName, this.longTermRetentionDatabaseName, this.backupName);
     }
 
 
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsImpl.java
index b005c4aec91b..7bf157f4cfd0 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsImpl.java
@@ -33,6 +33,78 @@ private LongTermRetentionBackupImpl wrapModel(LongTermRetentionBackupInner inner
         return  new LongTermRetentionBackupImpl(inner, manager());
     }
 
+    @Override
+    public Observable<LongTermRetentionBackup> listByResourceGroupLocationAsync(final String resourceGroupName, final String locationName) {
+        LongTermRetentionBackupsInner client = this.inner();
+        return client.listByResourceGroupLocationAsync(resourceGroupName, locationName)
+        .flatMapIterable(new Func1<Page<LongTermRetentionBackupInner>, Iterable<LongTermRetentionBackupInner>>() {
+            @Override
+            public Iterable<LongTermRetentionBackupInner> call(Page<LongTermRetentionBackupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LongTermRetentionBackupInner, LongTermRetentionBackup>() {
+            @Override
+            public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
+                return new LongTermRetentionBackupImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<LongTermRetentionBackup> listByResourceGroupServerAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName) {
+        LongTermRetentionBackupsInner client = this.inner();
+        return client.listByResourceGroupServerAsync(resourceGroupName, locationName, longTermRetentionServerName)
+        .flatMapIterable(new Func1<Page<LongTermRetentionBackupInner>, Iterable<LongTermRetentionBackupInner>>() {
+            @Override
+            public Iterable<LongTermRetentionBackupInner> call(Page<LongTermRetentionBackupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LongTermRetentionBackupInner, LongTermRetentionBackup>() {
+            @Override
+            public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
+                return new LongTermRetentionBackupImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<LongTermRetentionBackup> getAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        LongTermRetentionBackupsInner client = this.inner();
+        return client.getAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName)
+        .map(new Func1<LongTermRetentionBackupInner, LongTermRetentionBackup>() {
+            @Override
+            public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
+                return new LongTermRetentionBackupImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        LongTermRetentionBackupsInner client = this.inner();
+        return client.deleteAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toCompletable();
+    }
+
+    @Override
+    public Observable<LongTermRetentionBackup> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        LongTermRetentionBackupsInner client = this.inner();
+        return client.listByDatabaseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
+        .flatMapIterable(new Func1<Page<LongTermRetentionBackupInner>, Iterable<LongTermRetentionBackupInner>>() {
+            @Override
+            public Iterable<LongTermRetentionBackupInner> call(Page<LongTermRetentionBackupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LongTermRetentionBackupInner, LongTermRetentionBackup>() {
+            @Override
+            public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
+                return new LongTermRetentionBackupImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<LongTermRetentionBackup> listByLocationAsync(final String locationName) {
         LongTermRetentionBackupsInner client = this.inner();
@@ -70,9 +142,9 @@ public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
     }
 
     @Override
-    public Observable<LongTermRetentionBackup> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+    public Observable<LongTermRetentionBackup> listByResourceGroupDatabaseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
         LongTermRetentionBackupsInner client = this.inner();
-        return client.listByDatabaseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
+        return client.listByResourceGroupDatabaseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
         .flatMapIterable(new Func1<Page<LongTermRetentionBackupInner>, Iterable<LongTermRetentionBackupInner>>() {
             @Override
             public Iterable<LongTermRetentionBackupInner> call(Page<LongTermRetentionBackupInner> page) {
@@ -88,9 +160,9 @@ public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
     }
 
     @Override
-    public Observable<LongTermRetentionBackup> getAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+    public Observable<LongTermRetentionBackup> getByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
         LongTermRetentionBackupsInner client = this.inner();
-        return client.getAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName)
+        return client.getByResourceGroupAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName)
         .map(new Func1<LongTermRetentionBackupInner, LongTermRetentionBackup>() {
             @Override
             public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
@@ -100,9 +172,9 @@ public LongTermRetentionBackup call(LongTermRetentionBackupInner inner) {
     }
 
     @Override
-    public Completable deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+    public Completable deleteByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
         LongTermRetentionBackupsInner client = this.inner();
-        return client.deleteAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toCompletable();
+        return client.deleteByResourceGroupAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toCompletable();
     }
 
 }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsInner.java
index b4318cbee543..777798a3c7f7 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/LongTermRetentionBackupsInner.java
@@ -59,6 +59,30 @@ public LongTermRetentionBackupsInner(Retrofit retrofit, SqlManagementClientImpl
      * used by Retrofit to perform actually REST calls.
      */
     interface LongTermRetentionBackupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionServers/{longTermRetentionServerName}/longTermRetentionDatabases/{longTermRetentionDatabaseName}/longTermRetentionBackups/{backupName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("locationName") String locationName, @Path("longTermRetentionServerName") String longTermRetentionServerName, @Path("longTermRetentionDatabaseName") String longTermRetentionDatabaseName, @Path("backupName") String backupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups deleteByResourceGroup" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionServers/{longTermRetentionServerName}/longTermRetentionDatabases/{longTermRetentionDatabaseName}/longTermRetentionBackups/{backupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("locationName") String locationName, @Path("longTermRetentionServerName") String longTermRetentionServerName, @Path("longTermRetentionDatabaseName") String longTermRetentionDatabaseName, @Path("backupName") String backupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups beginDeleteByResourceGroup" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionServers/{longTermRetentionServerName}/longTermRetentionDatabases/{longTermRetentionDatabaseName}/longTermRetentionBackups/{backupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDeleteByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("locationName") String locationName, @Path("longTermRetentionServerName") String longTermRetentionServerName, @Path("longTermRetentionDatabaseName") String longTermRetentionDatabaseName, @Path("backupName") String backupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups listByResourceGroupDatabase" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionServers/{longTermRetentionServerName}/longTermRetentionDatabases/{longTermRetentionDatabaseName}/longTermRetentionBackups")
+        Observable<Response<ResponseBody>> listByResourceGroupDatabase(@Path("resourceGroupName") String resourceGroupName, @Path("locationName") String locationName, @Path("longTermRetentionServerName") String longTermRetentionServerName, @Path("longTermRetentionDatabaseName") String longTermRetentionDatabaseName, @Path("subscriptionId") String subscriptionId, @Query("onlyLatestPerDatabase") Boolean onlyLatestPerDatabase, @Query("databaseState") LongTermRetentionDatabaseState databaseState, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups listByResourceGroupLocation" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionBackups")
+        Observable<Response<ResponseBody>> listByResourceGroupLocation(@Path("resourceGroupName") String resourceGroupName, @Path("locationName") String locationName, @Path("subscriptionId") String subscriptionId, @Query("onlyLatestPerDatabase") Boolean onlyLatestPerDatabase, @Query("databaseState") LongTermRetentionDatabaseState databaseState, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups listByResourceGroupServer" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionServers/{longTermRetentionServerName}/longTermRetentionBackups")
+        Observable<Response<ResponseBody>> listByResourceGroupServer(@Path("resourceGroupName") String resourceGroupName, @Path("locationName") String locationName, @Path("longTermRetentionServerName") String longTermRetentionServerName, @Path("subscriptionId") String subscriptionId, @Query("onlyLatestPerDatabase") Boolean onlyLatestPerDatabase, @Query("databaseState") LongTermRetentionDatabaseState databaseState, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups get" })
         @GET("subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionServers/{longTermRetentionServerName}/longTermRetentionDatabases/{longTermRetentionDatabaseName}/longTermRetentionBackups/{backupName}")
         Observable<Response<ResponseBody>> get(@Path("locationName") String locationName, @Path("longTermRetentionServerName") String longTermRetentionServerName, @Path("longTermRetentionDatabaseName") String longTermRetentionDatabaseName, @Path("backupName") String backupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -83,6 +107,18 @@ interface LongTermRetentionBackupsService {
         @GET("subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationName}/longTermRetentionServers/{longTermRetentionServerName}/longTermRetentionBackups")
         Observable<Response<ResponseBody>> listByServer(@Path("locationName") String locationName, @Path("longTermRetentionServerName") String longTermRetentionServerName, @Path("subscriptionId") String subscriptionId, @Query("onlyLatestPerDatabase") Boolean onlyLatestPerDatabase, @Query("databaseState") LongTermRetentionDatabaseState databaseState, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups listByResourceGroupDatabaseNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupDatabaseNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups listByResourceGroupLocationNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupLocationNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups listByResourceGroupServerNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupServerNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.LongTermRetentionBackups listByDatabaseNext" })
         @GET
         Observable<Response<ResponseBody>> listByDatabaseNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -100,46 +136,49 @@ interface LongTermRetentionBackupsService {
     /**
      * Gets a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database.
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the LongTermRetentionBackupInner object if successful.
      */
-    public LongTermRetentionBackupInner get(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
-        return getWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().single().body();
+    public LongTermRetentionBackupInner getByResourceGroup(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().single().body();
     }
 
     /**
      * Gets a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database.
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<LongTermRetentionBackupInner> getAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<LongTermRetentionBackupInner> serviceCallback) {
-        return ServiceFuture.fromResponse(getWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
+    public ServiceFuture<LongTermRetentionBackupInner> getByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
     }
 
     /**
      * Gets a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database.
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the LongTermRetentionBackupInner object
      */
-    public Observable<LongTermRetentionBackupInner> getAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
-        return getWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<LongTermRetentionBackupInner>, LongTermRetentionBackupInner>() {
+    public Observable<LongTermRetentionBackupInner> getByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<LongTermRetentionBackupInner>, LongTermRetentionBackupInner>() {
             @Override
             public LongTermRetentionBackupInner call(ServiceResponse<LongTermRetentionBackupInner> response) {
                 return response.body();
@@ -150,14 +189,18 @@ public LongTermRetentionBackupInner call(ServiceResponse<LongTermRetentionBackup
     /**
      * Gets a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database.
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the LongTermRetentionBackupInner object
      */
-    public Observable<ServiceResponse<LongTermRetentionBackupInner>> getWithServiceResponseAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+    public Observable<ServiceResponse<LongTermRetentionBackupInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -176,12 +219,12 @@ public Observable<ServiceResponse<LongTermRetentionBackupInner>> getWithServiceR
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.get(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.getByResourceGroup(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LongTermRetentionBackupInner>>>() {
                 @Override
                 public Observable<ServiceResponse<LongTermRetentionBackupInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<LongTermRetentionBackupInner> clientResponse = getDelegate(response);
+                        ServiceResponse<LongTermRetentionBackupInner> clientResponse = getByResourceGroupDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -190,7 +233,7 @@ public Observable<ServiceResponse<LongTermRetentionBackupInner>> call(Response<R
             });
     }
 
-    private ServiceResponse<LongTermRetentionBackupInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+    private ServiceResponse<LongTermRetentionBackupInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<LongTermRetentionBackupInner, CloudException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<LongTermRetentionBackupInner>() { }.getType())
                 .registerError(CloudException.class)
@@ -200,45 +243,48 @@ private ServiceResponse<LongTermRetentionBackupInner> getDelegate(Response<Respo
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
-    public void delete(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
-        deleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().last().body();
+    public void deleteByResourceGroup(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        deleteByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().last().body();
     }
 
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<Void> deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<Void> serviceCallback) {
-        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
+    public ServiceFuture<Void> deleteByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
     }
 
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    public Observable<Void> deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
-        return deleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<Void>, Void>() {
+    public Observable<Void> deleteByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return deleteByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
             public Void call(ServiceResponse<Void> response) {
                 return response.body();
@@ -249,14 +295,18 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+    public Observable<ServiceResponse<Void>> deleteByResourceGroupWithServiceResponseAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -275,52 +325,55 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String l
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        Observable<Response<ResponseBody>> observable = service.delete(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        Observable<Response<ResponseBody>> observable = service.deleteByResourceGroup(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
         return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
     }
 
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
-    public void beginDelete(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
-        beginDeleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().single().body();
+    public void beginDeleteByResourceGroup(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        beginDeleteByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().single().body();
     }
 
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<Void> beginDeleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<Void> serviceCallback) {
-        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
+    public ServiceFuture<Void> beginDeleteByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
     }
 
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<Void> beginDeleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
-        return beginDeleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<Void>, Void>() {
+    public Observable<Void> beginDeleteByResourceGroupAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return beginDeleteByResourceGroupWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
             public Void call(ServiceResponse<Void> response) {
                 return response.body();
@@ -331,14 +384,18 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a long term retention backup.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param backupName The backup name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+    public Observable<ServiceResponse<Void>> beginDeleteByResourceGroupWithServiceResponseAsync(String resourceGroupName, String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -357,12 +414,12 @@ public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(Str
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.beginDelete(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.beginDeleteByResourceGroup(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
                 @Override
                 public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<Void> clientResponse = beginDeleteDelegate(response);
+                        ServiceResponse<Void> clientResponse = beginDeleteByResourceGroupDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -371,7 +428,7 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
             });
     }
 
-    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+    private ServiceResponse<Void> beginDeleteByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<Void>() { }.getType())
                 .register(202, new TypeToken<Void>() { }.getType())
@@ -382,20 +439,21 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
      */
-    public PagedList<LongTermRetentionBackupInner> listByDatabase(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
-        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName).toBlocking().single();
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupDatabase(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupDatabaseSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName).toBlocking().single();
         return new PagedList<LongTermRetentionBackupInner>(response.body()) {
             @Override
             public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
-                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+                return listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -403,20 +461,21 @@ public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<List<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupDatabaseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName),
+            listByResourceGroupDatabaseSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName),
             new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
-                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                    return listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
@@ -425,14 +484,15 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Stri
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<Page<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
-        return listByDatabaseWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupDatabaseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        return listByResourceGroupDatabaseWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
             .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
                 @Override
                 public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
@@ -444,14 +504,15 @@ public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRete
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
-        return listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupDatabaseWithServiceResponseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        return listByResourceGroupDatabaseSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
             .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
@@ -459,7 +520,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listByResourceGroupDatabaseNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
@@ -467,13 +528,17 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseSinglePageAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupDatabaseSinglePageAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -491,12 +556,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDat
         }
         final Boolean onlyLatestPerDatabase = null;
         final LongTermRetentionDatabaseState databaseState = null;
-        return service.listByDatabase(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByResourceGroupDatabase(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByDatabaseDelegate(response);
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupDatabaseDelegate(response);
                         return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -508,9 +573,10 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -518,12 +584,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
      */
-    public PagedList<LongTermRetentionBackupInner> listByDatabase(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState).toBlocking().single();
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupDatabase(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupDatabaseSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState).toBlocking().single();
         return new PagedList<LongTermRetentionBackupInner>(response.body()) {
             @Override
             public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
-                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+                return listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -531,22 +597,23 @@ public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<List<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupDatabaseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState),
+            listByResourceGroupDatabaseSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState),
             new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
-                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                    return listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
@@ -555,16 +622,17 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Stri
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<Page<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        return listByDatabaseWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState)
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupDatabaseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByResourceGroupDatabaseWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState)
             .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
                 @Override
                 public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
@@ -576,16 +644,17 @@ public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRete
     /**
      * Lists all long term retention backups for a database.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
-     * @param longTermRetentionDatabaseName the String value
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        return listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState)
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupDatabaseWithServiceResponseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByResourceGroupDatabaseSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState)
             .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
@@ -593,7 +662,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listByResourceGroupDatabaseNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
@@ -601,15 +670,19 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
     /**
      * Lists all long term retention backups for a database.
      *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param locationName The location of the database
-    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionServerName the String value
-    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionDatabaseName the String value
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionServerName The name of the server
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionDatabaseName The name of the database
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseSinglePageAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupDatabaseSinglePageAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -625,12 +698,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDat
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.listByDatabase(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByResourceGroupDatabase(resourceGroupName, locationName, longTermRetentionServerName, longTermRetentionDatabaseName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByDatabaseDelegate(response);
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupDatabaseDelegate(response);
                         return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -639,7 +712,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
             });
     }
 
-    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByResourceGroupDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
                 .registerError(CloudException.class)
@@ -649,18 +722,19 @@ private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByDatabaseDe
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
      */
-    public PagedList<LongTermRetentionBackupInner> listByLocation(final String locationName) {
-        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByLocationSinglePageAsync(locationName).toBlocking().single();
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupLocation(final String resourceGroupName, final String locationName) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupLocationSinglePageAsync(resourceGroupName, locationName).toBlocking().single();
         return new PagedList<LongTermRetentionBackupInner>(response.body()) {
             @Override
             public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
-                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+                return listByResourceGroupLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -668,18 +742,19 @@ public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<List<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupLocationAsync(final String resourceGroupName, final String locationName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listByLocationSinglePageAsync(locationName),
+            listByResourceGroupLocationSinglePageAsync(resourceGroupName, locationName),
             new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
-                    return listByLocationNextSinglePageAsync(nextPageLink);
+                    return listByResourceGroupLocationNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
@@ -688,12 +763,13 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Stri
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<Page<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName) {
-        return listByLocationWithServiceResponseAsync(locationName)
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupLocationAsync(final String resourceGroupName, final String locationName) {
+        return listByResourceGroupLocationWithServiceResponseAsync(resourceGroupName, locationName)
             .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
                 @Override
                 public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
@@ -705,12 +781,13 @@ public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRete
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationWithServiceResponseAsync(final String locationName) {
-        return listByLocationSinglePageAsync(locationName)
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupLocationWithServiceResponseAsync(final String resourceGroupName, final String locationName) {
+        return listByResourceGroupLocationSinglePageAsync(resourceGroupName, locationName)
             .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
@@ -718,7 +795,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listByResourceGroupLocationNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
@@ -726,11 +803,15 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationSinglePageAsync(final String locationName) {
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupLocationSinglePageAsync(final String resourceGroupName, final String locationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -742,12 +823,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLoc
         }
         final Boolean onlyLatestPerDatabase = null;
         final LongTermRetentionDatabaseState databaseState = null;
-        return service.listByLocation(locationName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByResourceGroupLocation(resourceGroupName, locationName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByLocationDelegate(response);
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupLocationDelegate(response);
                         return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -759,6 +840,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
@@ -767,12 +849,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
      */
-    public PagedList<LongTermRetentionBackupInner> listByLocation(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByLocationSinglePageAsync(locationName, onlyLatestPerDatabase, databaseState).toBlocking().single();
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupLocation(final String resourceGroupName, final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupLocationSinglePageAsync(resourceGroupName, locationName, onlyLatestPerDatabase, databaseState).toBlocking().single();
         return new PagedList<LongTermRetentionBackupInner>(response.body()) {
             @Override
             public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
-                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+                return listByResourceGroupLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -780,6 +862,7 @@ public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
@@ -787,13 +870,13 @@ public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<List<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupLocationAsync(final String resourceGroupName, final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listByLocationSinglePageAsync(locationName, onlyLatestPerDatabase, databaseState),
+            listByResourceGroupLocationSinglePageAsync(resourceGroupName, locationName, onlyLatestPerDatabase, databaseState),
             new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
-                    return listByLocationNextSinglePageAsync(nextPageLink);
+                    return listByResourceGroupLocationNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
@@ -802,14 +885,15 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Stri
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<Page<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        return listByLocationWithServiceResponseAsync(locationName, onlyLatestPerDatabase, databaseState)
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupLocationAsync(final String resourceGroupName, final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByResourceGroupLocationWithServiceResponseAsync(resourceGroupName, locationName, onlyLatestPerDatabase, databaseState)
             .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
                 @Override
                 public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
@@ -821,14 +905,15 @@ public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRete
     /**
      * Lists the long term retention backups for a given location.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationWithServiceResponseAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        return listByLocationSinglePageAsync(locationName, onlyLatestPerDatabase, databaseState)
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupLocationWithServiceResponseAsync(final String resourceGroupName, final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByResourceGroupLocationSinglePageAsync(resourceGroupName, locationName, onlyLatestPerDatabase, databaseState)
             .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
@@ -836,7 +921,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listByResourceGroupLocationNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
@@ -844,13 +929,17 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
     /**
      * Lists the long term retention backups for a given location.
      *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param locationName The location of the database
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationSinglePageAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupLocationSinglePageAsync(final String resourceGroupName, final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -860,12 +949,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLoc
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.listByLocation(locationName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByResourceGroupLocation(resourceGroupName, locationName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByLocationDelegate(response);
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupLocationDelegate(response);
                         return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -874,7 +963,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
             });
     }
 
-    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByLocationDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByResourceGroupLocationDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
                 .registerError(CloudException.class)
@@ -884,19 +973,20 @@ private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByLocationDe
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
      */
-    public PagedList<LongTermRetentionBackupInner> listByServer(final String locationName, final String longTermRetentionServerName) {
-        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByServerSinglePageAsync(locationName, longTermRetentionServerName).toBlocking().single();
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupServer(final String resourceGroupName, final String locationName, final String longTermRetentionServerName) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupServerSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName).toBlocking().single();
         return new PagedList<LongTermRetentionBackupInner>(response.body()) {
             @Override
             public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
-                return listByServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+                return listByResourceGroupServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -904,19 +994,20 @@ public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<List<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupServerAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listByServerSinglePageAsync(locationName, longTermRetentionServerName),
+            listByResourceGroupServerSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName),
             new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
-                    return listByServerNextSinglePageAsync(nextPageLink);
+                    return listByResourceGroupServerNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
@@ -925,13 +1016,14 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Stri
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<Page<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName) {
-        return listByServerWithServiceResponseAsync(locationName, longTermRetentionServerName)
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupServerAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName) {
+        return listByResourceGroupServerWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName)
             .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
                 @Override
                 public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
@@ -943,13 +1035,14 @@ public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRete
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName) {
-        return listByServerSinglePageAsync(locationName, longTermRetentionServerName)
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupServerWithServiceResponseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName) {
+        return listByResourceGroupServerSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName)
             .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
@@ -957,7 +1050,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listByServerNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listByResourceGroupServerNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
@@ -965,12 +1058,16 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerSinglePageAsync(final String locationName, final String longTermRetentionServerName) {
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupServerSinglePageAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -985,12 +1082,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listBySer
         }
         final Boolean onlyLatestPerDatabase = null;
         final LongTermRetentionDatabaseState databaseState = null;
-        return service.listByServer(locationName, longTermRetentionServerName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByResourceGroupServer(resourceGroupName, locationName, longTermRetentionServerName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByServerDelegate(response);
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupServerDelegate(response);
                         return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1002,8 +1099,9 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1011,12 +1109,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
      */
-    public PagedList<LongTermRetentionBackupInner> listByServer(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByServerSinglePageAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState).toBlocking().single();
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupServer(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupServerSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState).toBlocking().single();
         return new PagedList<LongTermRetentionBackupInner>(response.body()) {
             @Override
             public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
-                return listByServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+                return listByResourceGroupServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -1024,21 +1122,22 @@ public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<List<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupServerAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listByServerSinglePageAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState),
+            listByResourceGroupServerSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState),
             new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
-                    return listByServerNextSinglePageAsync(nextPageLink);
+                    return listByResourceGroupServerNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
@@ -1047,15 +1146,16 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Stri
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<Page<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        return listByServerWithServiceResponseAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState)
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupServerAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByResourceGroupServerWithServiceResponseAsync(resourceGroupName, locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState)
             .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
                 @Override
                 public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
@@ -1067,15 +1167,16 @@ public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRete
     /**
      * Lists the long term retention backups for a given server.
      *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param locationName The location of the database
-     * @param longTermRetentionServerName the String value
+     * @param longTermRetentionServerName The name of the server
      * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
      * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
-        return listByServerSinglePageAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState)
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupServerWithServiceResponseAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByResourceGroupServerSinglePageAsync(resourceGroupName, locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState)
             .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
@@ -1083,7 +1184,7 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listByServerNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listByResourceGroupServerNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
@@ -1091,14 +1192,18 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Serv
     /**
      * Lists the long term retention backups for a given server.
      *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param locationName The location of the database
-    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionServerName the String value
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionServerName The name of the server
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
     ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerSinglePageAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupServerSinglePageAsync(final String resourceGroupName, final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }
@@ -1111,12 +1216,12 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listBySer
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.listByServer(locationName, longTermRetentionServerName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByResourceGroupServer(resourceGroupName, locationName, longTermRetentionServerName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByServerDelegate(response);
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupServerDelegate(response);
                         return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1125,7 +1230,1375 @@ public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Resp
             });
     }
 
-    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByServerDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByResourceGroupServerDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a long term retention backup.
+     *
+     * @param locationName The location of the database.
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the LongTermRetentionBackupInner object if successful.
+     */
+    public LongTermRetentionBackupInner get(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return getWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a long term retention backup.
+     *
+     * @param locationName The location of the database.
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<LongTermRetentionBackupInner> getAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
+    }
+
+    /**
+     * Gets a long term retention backup.
+     *
+     * @param locationName The location of the database.
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LongTermRetentionBackupInner object
+     */
+    public Observable<LongTermRetentionBackupInner> getAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return getWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<LongTermRetentionBackupInner>, LongTermRetentionBackupInner>() {
+            @Override
+            public LongTermRetentionBackupInner call(ServiceResponse<LongTermRetentionBackupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a long term retention backup.
+     *
+     * @param locationName The location of the database.
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LongTermRetentionBackupInner object
+     */
+    public Observable<ServiceResponse<LongTermRetentionBackupInner>> getWithServiceResponseAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (longTermRetentionServerName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionServerName is required and cannot be null.");
+        }
+        if (longTermRetentionDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionDatabaseName is required and cannot be null.");
+        }
+        if (backupName == null) {
+            throw new IllegalArgumentException("Parameter backupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LongTermRetentionBackupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LongTermRetentionBackupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LongTermRetentionBackupInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LongTermRetentionBackupInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LongTermRetentionBackupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LongTermRetentionBackupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        deleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return deleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (longTermRetentionServerName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionServerName is required and cannot be null.");
+        }
+        if (longTermRetentionDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionDatabaseName is required and cannot be null.");
+        }
+        if (backupName == null) {
+            throw new IllegalArgumentException("Parameter backupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Observable<Response<ResponseBody>> observable = service.delete(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginDelete(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        beginDeleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> beginDeleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName), serviceCallback);
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        return beginDeleteWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a long term retention backup.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param backupName The backup name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String locationName, String longTermRetentionServerName, String longTermRetentionDatabaseName, String backupName) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (longTermRetentionServerName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionServerName is required and cannot be null.");
+        }
+        if (longTermRetentionDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionDatabaseName is required and cannot be null.");
+        }
+        if (backupName == null) {
+            throw new IllegalArgumentException("Parameter backupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.beginDelete(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, backupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByDatabase(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        return listByDatabaseWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        return listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseSinglePageAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (longTermRetentionServerName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionServerName is required and cannot be null.");
+        }
+        if (longTermRetentionDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionDatabaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Boolean onlyLatestPerDatabase = null;
+        final LongTermRetentionDatabaseState databaseState = null;
+        return service.listByDatabase(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByDatabase(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByDatabaseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByDatabaseWithServiceResponseAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param longTermRetentionDatabaseName The name of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByDatabaseSinglePageAsync(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, onlyLatestPerDatabase, databaseState)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param locationName The location of the database
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionServerName The name of the server
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionDatabaseName The name of the database
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByDatabaseSinglePageAsync(final String locationName, final String longTermRetentionServerName, final String longTermRetentionDatabaseName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (longTermRetentionServerName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionServerName is required and cannot be null.");
+        }
+        if (longTermRetentionDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionDatabaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByDatabase(locationName, longTermRetentionServerName, longTermRetentionDatabaseName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByLocation(final String locationName) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByLocationSinglePageAsync(locationName).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByLocationSinglePageAsync(locationName),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByLocationNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName) {
+        return listByLocationWithServiceResponseAsync(locationName)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationWithServiceResponseAsync(final String locationName) {
+        return listByLocationSinglePageAsync(locationName)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationSinglePageAsync(final String locationName) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Boolean onlyLatestPerDatabase = null;
+        final LongTermRetentionDatabaseState databaseState = null;
+        return service.listByLocation(locationName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByLocationDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByLocation(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByLocationSinglePageAsync(locationName, onlyLatestPerDatabase, databaseState).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByLocationSinglePageAsync(locationName, onlyLatestPerDatabase, databaseState),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByLocationNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByLocationAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByLocationWithServiceResponseAsync(locationName, onlyLatestPerDatabase, databaseState)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param locationName The location of the database
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationWithServiceResponseAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByLocationSinglePageAsync(locationName, onlyLatestPerDatabase, databaseState)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param locationName The location of the database
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByLocationSinglePageAsync(final String locationName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByLocation(locationName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByLocationDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByLocationDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByServer(final String locationName, final String longTermRetentionServerName) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByServerSinglePageAsync(locationName, longTermRetentionServerName).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByServerSinglePageAsync(locationName, longTermRetentionServerName),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByServerNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName) {
+        return listByServerWithServiceResponseAsync(locationName, longTermRetentionServerName)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName) {
+        return listByServerSinglePageAsync(locationName, longTermRetentionServerName)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByServerNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerSinglePageAsync(final String locationName, final String longTermRetentionServerName) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (longTermRetentionServerName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionServerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Boolean onlyLatestPerDatabase = null;
+        final LongTermRetentionDatabaseState databaseState = null;
+        return service.listByServer(locationName, longTermRetentionServerName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByServerDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByServer(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByServerSinglePageAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByServerSinglePageAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByServerNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByServerAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByServerWithServiceResponseAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param locationName The location of the database
+     * @param longTermRetentionServerName The name of the server
+     * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+     * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerWithServiceResponseAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        return listByServerSinglePageAsync(locationName, longTermRetentionServerName, onlyLatestPerDatabase, databaseState)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByServerNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param locationName The location of the database
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param longTermRetentionServerName The name of the server
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param onlyLatestPerDatabase Whether or not to only get the latest backup for each database.
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param databaseState Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByServerSinglePageAsync(final String locationName, final String longTermRetentionServerName, final Boolean onlyLatestPerDatabase, final LongTermRetentionDatabaseState databaseState) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (longTermRetentionServerName == null) {
+            throw new IllegalArgumentException("Parameter longTermRetentionServerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByServer(locationName, longTermRetentionServerName, this.client.subscriptionId(), onlyLatestPerDatabase, databaseState, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByServerDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByServerDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupDatabaseNext(final String nextPageLink) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupDatabaseNextAsync(final String nextPageLink, final ServiceFuture<List<LongTermRetentionBackupInner>> serviceFuture, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupDatabaseNextAsync(final String nextPageLink) {
+        return listByResourceGroupDatabaseNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupDatabaseNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupDatabaseNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all long term retention backups for a database.
+     *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupDatabaseNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByResourceGroupDatabaseNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupDatabaseNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByResourceGroupDatabaseNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupLocationNext(final String nextPageLink) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupLocationNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupLocationNextAsync(final String nextPageLink, final ServiceFuture<List<LongTermRetentionBackupInner>> serviceFuture, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupLocationNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupLocationNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupLocationNextAsync(final String nextPageLink) {
+        return listByResourceGroupLocationNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupLocationNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupLocationNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupLocationNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given location.
+     *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupLocationNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByResourceGroupLocationNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupLocationNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByResourceGroupLocationNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object if successful.
+     */
+    public PagedList<LongTermRetentionBackupInner> listByResourceGroupServerNext(final String nextPageLink) {
+        ServiceResponse<Page<LongTermRetentionBackupInner>> response = listByResourceGroupServerNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LongTermRetentionBackupInner>(response.body()) {
+            @Override
+            public Page<LongTermRetentionBackupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<LongTermRetentionBackupInner>> listByResourceGroupServerNextAsync(final String nextPageLink, final ServiceFuture<List<LongTermRetentionBackupInner>> serviceFuture, final ListOperationCallback<LongTermRetentionBackupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupServerNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupServerNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<Page<LongTermRetentionBackupInner>> listByResourceGroupServerNextAsync(final String nextPageLink) {
+        return listByResourceGroupServerNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Page<LongTermRetentionBackupInner>>() {
+                @Override
+                public Page<LongTermRetentionBackupInner> call(ServiceResponse<Page<LongTermRetentionBackupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LongTermRetentionBackupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupServerNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupServerNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LongTermRetentionBackupInner>>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(ServiceResponse<Page<LongTermRetentionBackupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupServerNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the long term retention backups for a given server.
+     *
+    ServiceResponse<PageImpl<LongTermRetentionBackupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LongTermRetentionBackupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> listByResourceGroupServerNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByResourceGroupServerNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LongTermRetentionBackupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LongTermRetentionBackupInner>> result = listByResourceGroupServerNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LongTermRetentionBackupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LongTermRetentionBackupInner>> listByResourceGroupServerNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<PageImpl<LongTermRetentionBackupInner>, CloudException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PageImpl<LongTermRetentionBackupInner>>() { }.getType())
                 .registerError(CloudException.class)
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedBackupShortTermRetentionPoliciesImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedBackupShortTermRetentionPoliciesImpl.java
index 55d69142e474..cf0a72b2ca3a 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedBackupShortTermRetentionPoliciesImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedBackupShortTermRetentionPoliciesImpl.java
@@ -14,7 +14,7 @@
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.Page;
-import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedBackupShortTermRetentionPolicy;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy;
 
 class ManagedBackupShortTermRetentionPoliciesImpl extends WrapperImpl<ManagedBackupShortTermRetentionPoliciesInner> implements ManagedBackupShortTermRetentionPolicies {
     private final SqlManager manager;
@@ -29,20 +29,20 @@ public SqlManager manager() {
     }
 
     @Override
-    public ManagedBackupShortTermRetentionPolicyImpl define(String name) {
+    public DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl define(String name) {
         return wrapModel(name);
     }
 
-    private ManagedBackupShortTermRetentionPolicyImpl wrapModel(ManagedBackupShortTermRetentionPolicyInner inner) {
-        return  new ManagedBackupShortTermRetentionPolicyImpl(inner, manager());
+    private DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl wrapModel(ManagedBackupShortTermRetentionPolicyInner inner) {
+        return  new DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(inner, manager());
     }
 
-    private ManagedBackupShortTermRetentionPolicyImpl wrapModel(String name) {
-        return new ManagedBackupShortTermRetentionPolicyImpl(name, this.manager());
+    private DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl wrapModel(String name) {
+        return new DatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(name, this.manager());
     }
 
     @Override
-    public Observable<ManagedBackupShortTermRetentionPolicy> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName) {
+    public Observable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName) {
         ManagedBackupShortTermRetentionPoliciesInner client = this.inner();
         return client.listByDatabaseAsync(resourceGroupName, managedInstanceName, databaseName)
         .flatMapIterable(new Func1<Page<ManagedBackupShortTermRetentionPolicyInner>, Iterable<ManagedBackupShortTermRetentionPolicyInner>>() {
@@ -51,21 +51,21 @@ public Iterable<ManagedBackupShortTermRetentionPolicyInner> call(Page<ManagedBac
                 return page.items();
             }
         })
-        .map(new Func1<ManagedBackupShortTermRetentionPolicyInner, ManagedBackupShortTermRetentionPolicy>() {
+        .map(new Func1<ManagedBackupShortTermRetentionPolicyInner, DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>() {
             @Override
-            public ManagedBackupShortTermRetentionPolicy call(ManagedBackupShortTermRetentionPolicyInner inner) {
+            public DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy call(ManagedBackupShortTermRetentionPolicyInner inner) {
                 return wrapModel(inner);
             }
         });
     }
 
     @Override
-    public Observable<ManagedBackupShortTermRetentionPolicy> getAsync(String resourceGroupName, String managedInstanceName, String databaseName) {
+    public Observable<DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> getAsync(String resourceGroupName, String managedInstanceName, String databaseName) {
         ManagedBackupShortTermRetentionPoliciesInner client = this.inner();
         return client.getAsync(resourceGroupName, managedInstanceName, databaseName)
-        .map(new Func1<ManagedBackupShortTermRetentionPolicyInner, ManagedBackupShortTermRetentionPolicy>() {
+        .map(new Func1<ManagedBackupShortTermRetentionPolicyInner, DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>() {
             @Override
-            public ManagedBackupShortTermRetentionPolicy call(ManagedBackupShortTermRetentionPolicyInner inner) {
+            public DatabasisManagedInstanceManagedBackupShortTermRetentionPolicy call(ManagedBackupShortTermRetentionPolicyInner inner) {
                 return wrapModel(inner);
             }
        });
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseImpl.java
index c94888814d2e..1ccab4d6b2ec 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseImpl.java
@@ -146,6 +146,16 @@ public String name() {
         return this.inner().name();
     }
 
+    @Override
+    public String recoverableDatabaseId() {
+        return this.inner().recoverableDatabaseId();
+    }
+
+    @Override
+    public String restorableDroppedDatabaseId() {
+        return this.inner().restorableDroppedDatabaseId();
+    }
+
     @Override
     public DateTime restorePointInTime() {
         return this.inner().restorePointInTime();
@@ -224,6 +234,26 @@ public ManagedDatabaseImpl withCreateMode(ManagedDatabaseCreateMode createMode)
         return this;
     }
 
+    @Override
+    public ManagedDatabaseImpl withRecoverableDatabaseId(String recoverableDatabaseId) {
+        if (isInCreateMode()) {
+            this.inner().withRecoverableDatabaseId(recoverableDatabaseId);
+        } else {
+            this.updateParameter.withRecoverableDatabaseId(recoverableDatabaseId);
+        }
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseImpl withRestorableDroppedDatabaseId(String restorableDroppedDatabaseId) {
+        if (isInCreateMode()) {
+            this.inner().withRestorableDroppedDatabaseId(restorableDroppedDatabaseId);
+        } else {
+            this.updateParameter.withRestorableDroppedDatabaseId(restorableDroppedDatabaseId);
+        }
+        return this;
+    }
+
     @Override
     public ManagedDatabaseImpl withRestorePointInTime(DateTime restorePointInTime) {
         if (isInCreateMode()) {
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseInner.java
index 9f704415711c..d02e6a1de06e 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseInner.java
@@ -28,8 +28,8 @@ public class ManagedDatabaseInner extends Resource {
     private String collation;
 
     /**
-     * Status for the database. Possible values include: 'Online', 'Offline',
-     * 'Shutdown', 'Creating', 'Inaccessible'.
+     * Status of the database. Possible values include: 'Online', 'Offline',
+     * 'Shutdown', 'Creating', 'Inaccessible', 'Updating'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private ManagedDatabaseStatus status;
@@ -73,8 +73,11 @@ public class ManagedDatabaseInner extends Resource {
      * SourceDatabaseName, SourceManagedInstanceName and PointInTime must be
      * specified. RestoreExternalBackup: Create a database by restoring from
      * external backup files. Collation, StorageContainerUri and
-     * StorageContainerSasToken must be specified. Possible values include:
-     * 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'.
+     * StorageContainerSasToken must be specified. Recovery: Creates a database
+     * by restoring a geo-replicated backup. RecoverableDatabaseId must be
+     * specified as the recoverable database resource ID to restore. Possible
+     * values include: 'Default', 'RestoreExternalBackup',
+     * 'PointInTimeRestore', 'Recovery'.
      */
     @JsonProperty(value = "properties.createMode")
     private ManagedDatabaseCreateMode createMode;
@@ -94,6 +97,13 @@ public class ManagedDatabaseInner extends Resource {
     @JsonProperty(value = "properties.sourceDatabaseId")
     private String sourceDatabaseId;
 
+    /**
+     * The restorable dropped database resource id to restore when creating
+     * this database.
+     */
+    @JsonProperty(value = "properties.restorableDroppedDatabaseId")
+    private String restorableDroppedDatabaseId;
+
     /**
      * Conditional. If createMode is RestoreExternalBackup, this value is
      * required. Specifies the storage container sas token.
@@ -108,6 +118,13 @@ public class ManagedDatabaseInner extends Resource {
     @JsonProperty(value = "properties.failoverGroupId", access = JsonProperty.Access.WRITE_ONLY)
     private String failoverGroupId;
 
+    /**
+     * The resource identifier of the recoverable database associated with
+     * create operation of this database.
+     */
+    @JsonProperty(value = "properties.recoverableDatabaseId")
+    private String recoverableDatabaseId;
+
     /**
      * Get collation of the managed database.
      *
@@ -129,7 +146,7 @@ public ManagedDatabaseInner withCollation(String collation) {
     }
 
     /**
-     * Get status for the database. Possible values include: 'Online', 'Offline', 'Shutdown', 'Creating', 'Inaccessible'.
+     * Get status of the database. Possible values include: 'Online', 'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Updating'.
      *
      * @return the status value
      */
@@ -205,7 +222,7 @@ public ManagedDatabaseInner withCatalogCollation(CatalogCollationType catalogCol
     }
 
     /**
-     * Get managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'.
+     * Get managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Recovery: Creates a database by restoring a geo-replicated backup. RecoverableDatabaseId must be specified as the recoverable database resource ID to restore. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore', 'Recovery'.
      *
      * @return the createMode value
      */
@@ -214,7 +231,7 @@ public ManagedDatabaseCreateMode createMode() {
     }
 
     /**
-     * Set managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore'.
+     * Set managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Recovery: Creates a database by restoring a geo-replicated backup. RecoverableDatabaseId must be specified as the recoverable database resource ID to restore. Possible values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore', 'Recovery'.
      *
      * @param createMode the createMode value to set
      * @return the ManagedDatabaseInner object itself.
@@ -264,6 +281,26 @@ public ManagedDatabaseInner withSourceDatabaseId(String sourceDatabaseId) {
         return this;
     }
 
+    /**
+     * Get the restorable dropped database resource id to restore when creating this database.
+     *
+     * @return the restorableDroppedDatabaseId value
+     */
+    public String restorableDroppedDatabaseId() {
+        return this.restorableDroppedDatabaseId;
+    }
+
+    /**
+     * Set the restorable dropped database resource id to restore when creating this database.
+     *
+     * @param restorableDroppedDatabaseId the restorableDroppedDatabaseId value to set
+     * @return the ManagedDatabaseInner object itself.
+     */
+    public ManagedDatabaseInner withRestorableDroppedDatabaseId(String restorableDroppedDatabaseId) {
+        this.restorableDroppedDatabaseId = restorableDroppedDatabaseId;
+        return this;
+    }
+
     /**
      * Get conditional. If createMode is RestoreExternalBackup, this value is required. Specifies the storage container sas token.
      *
@@ -293,4 +330,24 @@ public String failoverGroupId() {
         return this.failoverGroupId;
     }
 
+    /**
+     * Get the resource identifier of the recoverable database associated with create operation of this database.
+     *
+     * @return the recoverableDatabaseId value
+     */
+    public String recoverableDatabaseId() {
+        return this.recoverableDatabaseId;
+    }
+
+    /**
+     * Set the resource identifier of the recoverable database associated with create operation of this database.
+     *
+     * @param recoverableDatabaseId the recoverableDatabaseId value to set
+     * @return the ManagedDatabaseInner object itself.
+     */
+    public ManagedDatabaseInner withRecoverableDatabaseId(String recoverableDatabaseId) {
+        this.recoverableDatabaseId = recoverableDatabaseId;
+        return this;
+    }
+
 }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPoliciesImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPoliciesImpl.java
new file mode 100644
index 000000000000..909f6becf04f
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPoliciesImpl.java
@@ -0,0 +1,74 @@
+/**
+ * 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.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicies;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicy;
+
+class ManagedDatabaseSecurityAlertPoliciesImpl extends WrapperImpl<ManagedDatabaseSecurityAlertPoliciesInner> implements ManagedDatabaseSecurityAlertPolicies {
+    private final SqlManager manager;
+
+    ManagedDatabaseSecurityAlertPoliciesImpl(SqlManager manager) {
+        super(manager.inner().managedDatabaseSecurityAlertPolicies());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ManagedDatabaseSecurityAlertPolicyImpl wrapModel(ManagedDatabaseSecurityAlertPolicyInner inner) {
+        return  new ManagedDatabaseSecurityAlertPolicyImpl(inner, manager());
+    }
+
+    private ManagedDatabaseSecurityAlertPolicyImpl wrapModel(String name) {
+        return new ManagedDatabaseSecurityAlertPolicyImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ManagedDatabaseSecurityAlertPolicy> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName) {
+        ManagedDatabaseSecurityAlertPoliciesInner client = this.inner();
+        return client.listByDatabaseAsync(resourceGroupName, managedInstanceName, databaseName)
+        .flatMapIterable(new Func1<Page<ManagedDatabaseSecurityAlertPolicyInner>, Iterable<ManagedDatabaseSecurityAlertPolicyInner>>() {
+            @Override
+            public Iterable<ManagedDatabaseSecurityAlertPolicyInner> call(Page<ManagedDatabaseSecurityAlertPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedDatabaseSecurityAlertPolicyInner, ManagedDatabaseSecurityAlertPolicy>() {
+            @Override
+            public ManagedDatabaseSecurityAlertPolicy call(ManagedDatabaseSecurityAlertPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ManagedDatabaseSecurityAlertPolicy> getAsync(String resourceGroupName, String managedInstanceName, String databaseName) {
+        ManagedDatabaseSecurityAlertPoliciesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, databaseName)
+        .map(new Func1<ManagedDatabaseSecurityAlertPolicyInner, ManagedDatabaseSecurityAlertPolicy>() {
+            @Override
+            public ManagedDatabaseSecurityAlertPolicy call(ManagedDatabaseSecurityAlertPolicyInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPoliciesInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPoliciesInner.java
new file mode 100644
index 000000000000..f18737d42a4b
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPoliciesInner.java
@@ -0,0 +1,520 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ManagedDatabaseSecurityAlertPolicies.
+ */
+public class ManagedDatabaseSecurityAlertPoliciesInner {
+    /** The Retrofit service to perform REST calls. */
+    private ManagedDatabaseSecurityAlertPoliciesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedDatabaseSecurityAlertPoliciesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ManagedDatabaseSecurityAlertPoliciesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(ManagedDatabaseSecurityAlertPoliciesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ManagedDatabaseSecurityAlertPolicies to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagedDatabaseSecurityAlertPoliciesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicies get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/databases/{databaseName}/securityAlertPolicies/{securityAlertPolicyName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("databaseName") String databaseName, @Path("securityAlertPolicyName") String securityAlertPolicyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicies createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/databases/{databaseName}/securityAlertPolicies/{securityAlertPolicyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("databaseName") String databaseName, @Path("securityAlertPolicyName") String securityAlertPolicyName, @Path("subscriptionId") String subscriptionId, @Body ManagedDatabaseSecurityAlertPolicyInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicies listByDatabase" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/databases/{databaseName}/securityAlertPolicies")
+        Observable<Response<ResponseBody>> listByDatabase(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("databaseName") String databaseName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicies listByDatabaseNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByDatabaseNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a managed database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object if successful.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner get(String resourceGroupName, String managedInstanceName, String databaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, databaseName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a managed database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedDatabaseSecurityAlertPolicyInner> getAsync(String resourceGroupName, String managedInstanceName, String databaseName, final ServiceCallback<ManagedDatabaseSecurityAlertPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, databaseName), serviceCallback);
+    }
+
+    /**
+     * Gets a managed database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedDatabaseSecurityAlertPolicyInner object
+     */
+    public Observable<ManagedDatabaseSecurityAlertPolicyInner> getAsync(String resourceGroupName, String managedInstanceName, String databaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, databaseName).map(new Func1<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>, ManagedDatabaseSecurityAlertPolicyInner>() {
+            @Override
+            public ManagedDatabaseSecurityAlertPolicyInner call(ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a managed database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedDatabaseSecurityAlertPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String databaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String securityAlertPolicyName = "default";
+        return service.get(resourceGroupName, managedInstanceName, databaseName, securityAlertPolicyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedDatabaseSecurityAlertPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedDatabaseSecurityAlertPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @param parameters The database security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object if successful.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner createOrUpdate(String resourceGroupName, String managedInstanceName, String databaseName, ManagedDatabaseSecurityAlertPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, databaseName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @param parameters The database security alert policy.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedDatabaseSecurityAlertPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String databaseName, ManagedDatabaseSecurityAlertPolicyInner parameters, final ServiceCallback<ManagedDatabaseSecurityAlertPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, databaseName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @param parameters The database security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedDatabaseSecurityAlertPolicyInner object
+     */
+    public Observable<ManagedDatabaseSecurityAlertPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String databaseName, ManagedDatabaseSecurityAlertPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, databaseName, parameters).map(new Func1<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>, ManagedDatabaseSecurityAlertPolicyInner>() {
+            @Override
+            public ManagedDatabaseSecurityAlertPolicyInner call(ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a database's security alert policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policy is defined.
+     * @param parameters The database security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedDatabaseSecurityAlertPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String databaseName, ManagedDatabaseSecurityAlertPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String securityAlertPolicyName = "default";
+        return service.createOrUpdate(resourceGroupName, managedInstanceName, databaseName, securityAlertPolicyName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedDatabaseSecurityAlertPolicyInner> createOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedDatabaseSecurityAlertPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedDatabaseSecurityAlertPolicyInner>() { }.getType())
+                .register(201, new TypeToken<ManagedDatabaseSecurityAlertPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policies are defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object if successful.
+     */
+    public PagedList<ManagedDatabaseSecurityAlertPolicyInner> listByDatabase(final String resourceGroupName, final String managedInstanceName, final String databaseName) {
+        ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>> response = listByDatabaseSinglePageAsync(resourceGroupName, managedInstanceName, databaseName).toBlocking().single();
+        return new PagedList<ManagedDatabaseSecurityAlertPolicyInner>(response.body()) {
+            @Override
+            public Page<ManagedDatabaseSecurityAlertPolicyInner> nextPage(String nextPageLink) {
+                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policies are defined.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedDatabaseSecurityAlertPolicyInner>> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName, final ListOperationCallback<ManagedDatabaseSecurityAlertPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByDatabaseSinglePageAsync(resourceGroupName, managedInstanceName, databaseName),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> call(String nextPageLink) {
+                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policies are defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<Page<ManagedDatabaseSecurityAlertPolicyInner>> listByDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName) {
+        return listByDatabaseWithServiceResponseAsync(resourceGroupName, managedInstanceName, databaseName)
+            .map(new Func1<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>, Page<ManagedDatabaseSecurityAlertPolicyInner>>() {
+                @Override
+                public Page<ManagedDatabaseSecurityAlertPolicyInner> call(ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param databaseName The name of the managed database for which the security alert policies are defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> listByDatabaseWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName) {
+        return listByDatabaseSinglePageAsync(resourceGroupName, managedInstanceName, databaseName)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>, Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> call(ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+    ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> * @param managedInstanceName The name of the managed instance.
+    ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> * @param databaseName The name of the managed database for which the security alert policies are defined.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> listByDatabaseSinglePageAsync(final String resourceGroupName, final String managedInstanceName, final String databaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByDatabase(resourceGroupName, managedInstanceName, databaseName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> result = listByDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> listByDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object if successful.
+     */
+    public PagedList<ManagedDatabaseSecurityAlertPolicyInner> listByDatabaseNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>> response = listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedDatabaseSecurityAlertPolicyInner>(response.body()) {
+            @Override
+            public Page<ManagedDatabaseSecurityAlertPolicyInner> nextPage(String nextPageLink) {
+                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedDatabaseSecurityAlertPolicyInner>> listByDatabaseNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedDatabaseSecurityAlertPolicyInner>> serviceFuture, final ListOperationCallback<ManagedDatabaseSecurityAlertPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByDatabaseNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> call(String nextPageLink) {
+                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<Page<ManagedDatabaseSecurityAlertPolicyInner>> listByDatabaseNextAsync(final String nextPageLink) {
+        return listByDatabaseNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>, Page<ManagedDatabaseSecurityAlertPolicyInner>>() {
+                @Override
+                public Page<ManagedDatabaseSecurityAlertPolicyInner> call(ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> listByDatabaseNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByDatabaseNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>, Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> call(ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed database's security alert policies.
+     *
+    ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedDatabaseSecurityAlertPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> listByDatabaseNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByDatabaseNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> result = listByDatabaseNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedDatabaseSecurityAlertPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>> listByDatabaseNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedDatabaseSecurityAlertPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPolicyImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPolicyImpl.java
new file mode 100644
index 000000000000..23a4e802955b
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPolicyImpl.java
@@ -0,0 +1,180 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicy;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SecurityAlertPolicyState;
+import java.util.List;
+import org.joda.time.DateTime;
+
+class ManagedDatabaseSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ManagedDatabaseSecurityAlertPolicy, ManagedDatabaseSecurityAlertPolicyInner, ManagedDatabaseSecurityAlertPolicyImpl> implements ManagedDatabaseSecurityAlertPolicy, ManagedDatabaseSecurityAlertPolicy.Definition, ManagedDatabaseSecurityAlertPolicy.Update {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String databaseName;
+
+    ManagedDatabaseSecurityAlertPolicyImpl(String name, SqlManager manager) {
+        super(name, new ManagedDatabaseSecurityAlertPolicyInner());
+        this.manager = manager;
+        // Set resource name
+        this.databaseName = name;
+        //
+    }
+
+    ManagedDatabaseSecurityAlertPolicyImpl(ManagedDatabaseSecurityAlertPolicyInner inner, SqlManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.databaseName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.databaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "databases");
+        //
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ManagedDatabaseSecurityAlertPolicy> createResourceAsync() {
+        ManagedDatabaseSecurityAlertPoliciesInner client = this.manager().inner().managedDatabaseSecurityAlertPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.databaseName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ManagedDatabaseSecurityAlertPolicy> updateResourceAsync() {
+        ManagedDatabaseSecurityAlertPoliciesInner client = this.manager().inner().managedDatabaseSecurityAlertPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.databaseName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ManagedDatabaseSecurityAlertPolicyInner> getInnerAsync() {
+        ManagedDatabaseSecurityAlertPoliciesInner client = this.manager().inner().managedDatabaseSecurityAlertPolicies();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.databaseName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public DateTime creationTime() {
+        return this.inner().creationTime();
+    }
+
+    @Override
+    public List<String> disabledAlerts() {
+        return this.inner().disabledAlerts();
+    }
+
+    @Override
+    public Boolean emailAccountAdmins() {
+        return this.inner().emailAccountAdmins();
+    }
+
+    @Override
+    public List<String> emailAddresses() {
+        return this.inner().emailAddresses();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer retentionDays() {
+        return this.inner().retentionDays();
+    }
+
+    @Override
+    public SecurityAlertPolicyState state() {
+        return this.inner().state();
+    }
+
+    @Override
+    public String storageAccountAccessKey() {
+        return this.inner().storageAccountAccessKey();
+    }
+
+    @Override
+    public String storageEndpoint() {
+        return this.inner().storageEndpoint();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withExistingDatabasis(String resourceGroupName, String managedInstanceName, String databaseName) {
+        this.resourceGroupName = resourceGroupName;
+        this.managedInstanceName = managedInstanceName;
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withState(SecurityAlertPolicyState state) {
+        this.inner().withState(state);
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withDisabledAlerts(List<String> disabledAlerts) {
+        this.inner().withDisabledAlerts(disabledAlerts);
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withEmailAccountAdmins(Boolean emailAccountAdmins) {
+        this.inner().withEmailAccountAdmins(emailAccountAdmins);
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withEmailAddresses(List<String> emailAddresses) {
+        this.inner().withEmailAddresses(emailAddresses);
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withRetentionDays(Integer retentionDays) {
+        this.inner().withRetentionDays(retentionDays);
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withStorageAccountAccessKey(String storageAccountAccessKey) {
+        this.inner().withStorageAccountAccessKey(storageAccountAccessKey);
+        return this;
+    }
+
+    @Override
+    public ManagedDatabaseSecurityAlertPolicyImpl withStorageEndpoint(String storageEndpoint) {
+        this.inner().withStorageEndpoint(storageEndpoint);
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPolicyInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPolicyInner.java
new file mode 100644
index 000000000000..00ae08954262
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabaseSecurityAlertPolicyInner.java
@@ -0,0 +1,227 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SecurityAlertPolicyState;
+import java.util.List;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A managed database security alert policy.
+ */
+@JsonFlatten
+public class ManagedDatabaseSecurityAlertPolicyInner extends ProxyResource {
+    /**
+     * Specifies the state of the policy, whether it is enabled or disabled or
+     * a policy has not been applied yet on the specific database. Possible
+     * values include: 'New', 'Enabled', 'Disabled'.
+     */
+    @JsonProperty(value = "properties.state", required = true)
+    private SecurityAlertPolicyState state;
+
+    /**
+     * Specifies an array of alerts that are disabled. Allowed values are:
+     * Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly,
+     * Data_Exfiltration, Unsafe_Action.
+     */
+    @JsonProperty(value = "properties.disabledAlerts")
+    private List<String> disabledAlerts;
+
+    /**
+     * Specifies an array of e-mail addresses to which the alert is sent.
+     */
+    @JsonProperty(value = "properties.emailAddresses")
+    private List<String> emailAddresses;
+
+    /**
+     * Specifies that the alert is sent to the account administrators.
+     */
+    @JsonProperty(value = "properties.emailAccountAdmins")
+    private Boolean emailAccountAdmins;
+
+    /**
+     * Specifies the blob storage endpoint (e.g.
+     * https://MyAccount.blob.core.windows.net). This blob storage will hold
+     * all Threat Detection audit logs.
+     */
+    @JsonProperty(value = "properties.storageEndpoint")
+    private String storageEndpoint;
+
+    /**
+     * Specifies the identifier key of the Threat Detection audit storage
+     * account.
+     */
+    @JsonProperty(value = "properties.storageAccountAccessKey")
+    private String storageAccountAccessKey;
+
+    /**
+     * Specifies the number of days to keep in the Threat Detection audit logs.
+     */
+    @JsonProperty(value = "properties.retentionDays")
+    private Integer retentionDays;
+
+    /**
+     * Specifies the UTC creation time of the policy.
+     */
+    @JsonProperty(value = "properties.creationTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime creationTime;
+
+    /**
+     * Get specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'.
+     *
+     * @return the state value
+     */
+    public SecurityAlertPolicyState state() {
+        return this.state;
+    }
+
+    /**
+     * Set specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'.
+     *
+     * @param state the state value to set
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object itself.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner withState(SecurityAlertPolicyState state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action.
+     *
+     * @return the disabledAlerts value
+     */
+    public List<String> disabledAlerts() {
+        return this.disabledAlerts;
+    }
+
+    /**
+     * Set specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action.
+     *
+     * @param disabledAlerts the disabledAlerts value to set
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object itself.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner withDisabledAlerts(List<String> disabledAlerts) {
+        this.disabledAlerts = disabledAlerts;
+        return this;
+    }
+
+    /**
+     * Get specifies an array of e-mail addresses to which the alert is sent.
+     *
+     * @return the emailAddresses value
+     */
+    public List<String> emailAddresses() {
+        return this.emailAddresses;
+    }
+
+    /**
+     * Set specifies an array of e-mail addresses to which the alert is sent.
+     *
+     * @param emailAddresses the emailAddresses value to set
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object itself.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner withEmailAddresses(List<String> emailAddresses) {
+        this.emailAddresses = emailAddresses;
+        return this;
+    }
+
+    /**
+     * Get specifies that the alert is sent to the account administrators.
+     *
+     * @return the emailAccountAdmins value
+     */
+    public Boolean emailAccountAdmins() {
+        return this.emailAccountAdmins;
+    }
+
+    /**
+     * Set specifies that the alert is sent to the account administrators.
+     *
+     * @param emailAccountAdmins the emailAccountAdmins value to set
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object itself.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner withEmailAccountAdmins(Boolean emailAccountAdmins) {
+        this.emailAccountAdmins = emailAccountAdmins;
+        return this;
+    }
+
+    /**
+     * Get specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs.
+     *
+     * @return the storageEndpoint value
+     */
+    public String storageEndpoint() {
+        return this.storageEndpoint;
+    }
+
+    /**
+     * Set specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs.
+     *
+     * @param storageEndpoint the storageEndpoint value to set
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object itself.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner withStorageEndpoint(String storageEndpoint) {
+        this.storageEndpoint = storageEndpoint;
+        return this;
+    }
+
+    /**
+     * Get specifies the identifier key of the Threat Detection audit storage account.
+     *
+     * @return the storageAccountAccessKey value
+     */
+    public String storageAccountAccessKey() {
+        return this.storageAccountAccessKey;
+    }
+
+    /**
+     * Set specifies the identifier key of the Threat Detection audit storage account.
+     *
+     * @param storageAccountAccessKey the storageAccountAccessKey value to set
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object itself.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner withStorageAccountAccessKey(String storageAccountAccessKey) {
+        this.storageAccountAccessKey = storageAccountAccessKey;
+        return this;
+    }
+
+    /**
+     * Get specifies the number of days to keep in the Threat Detection audit logs.
+     *
+     * @return the retentionDays value
+     */
+    public Integer retentionDays() {
+        return this.retentionDays;
+    }
+
+    /**
+     * Set specifies the number of days to keep in the Threat Detection audit logs.
+     *
+     * @param retentionDays the retentionDays value to set
+     * @return the ManagedDatabaseSecurityAlertPolicyInner object itself.
+     */
+    public ManagedDatabaseSecurityAlertPolicyInner withRetentionDays(Integer retentionDays) {
+        this.retentionDays = retentionDays;
+        return this;
+    }
+
+    /**
+     * Get specifies the UTC creation time of the policy.
+     *
+     * @return the creationTime value
+     */
+    public DateTime creationTime() {
+        return this.creationTime;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabasesInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabasesInner.java
index 978f15b2b56c..db23e9b7f3ba 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabasesInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedDatabasesInner.java
@@ -688,7 +688,7 @@ private ServiceResponse<ManagedDatabaseInner> beginCreateOrUpdateDelegate(Respon
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
@@ -702,7 +702,7 @@ public void delete(String resourceGroupName, String managedInstanceName, String
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
@@ -716,7 +716,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String managedI
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
@@ -734,7 +734,7 @@ public Void call(ServiceResponse<Void> response) {
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
@@ -763,7 +763,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
@@ -777,7 +777,7 @@ public void beginDelete(String resourceGroupName, String managedInstanceName, St
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
@@ -791,7 +791,7 @@ public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String man
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
@@ -809,7 +809,7 @@ public Void call(ServiceResponse<Void> response) {
     }
 
     /**
-     * Deletes the managed database.
+     * Deletes a managed database.
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param managedInstanceName The name of the managed instance.
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorImpl.java
new file mode 100644
index 000000000000..24b419b5170e
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorImpl.java
@@ -0,0 +1,139 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrator;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.UUID;
+
+class ManagedInstanceAdministratorImpl extends CreatableUpdatableImpl<ManagedInstanceAdministrator, ManagedInstanceAdministratorInner, ManagedInstanceAdministratorImpl> implements ManagedInstanceAdministrator, ManagedInstanceAdministrator.Definition, ManagedInstanceAdministrator.Update {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String administratorName;
+
+    ManagedInstanceAdministratorImpl(String name, SqlManager manager) {
+        super(name, new ManagedInstanceAdministratorInner());
+        this.manager = manager;
+        // Set resource name
+        this.administratorName = name;
+        //
+    }
+
+    ManagedInstanceAdministratorImpl(ManagedInstanceAdministratorInner inner, SqlManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.administratorName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.administratorName = IdParsingUtils.getValueFromIdByName(inner.id(), "administrators");
+        //
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ManagedInstanceAdministrator> createResourceAsync() {
+        ManagedInstanceAdministratorsInner client = this.manager().inner().managedInstanceAdministrators();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.administratorName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ManagedInstanceAdministrator> updateResourceAsync() {
+        ManagedInstanceAdministratorsInner client = this.manager().inner().managedInstanceAdministrators();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.administratorName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ManagedInstanceAdministratorInner> getInnerAsync() {
+        ManagedInstanceAdministratorsInner client = this.manager().inner().managedInstanceAdministrators();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.administratorName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String administratorType() {
+        return this.inner().administratorType();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String login() {
+        return this.inner().login();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public UUID sid() {
+        return this.inner().sid();
+    }
+
+    @Override
+    public UUID tenantId() {
+        return this.inner().tenantId();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ManagedInstanceAdministratorImpl withExistingManagedInstance(String resourceGroupName, String managedInstanceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.managedInstanceName = managedInstanceName;
+        return this;
+    }
+
+    @Override
+    public ManagedInstanceAdministratorImpl withAdministratorType(String administratorType) {
+        this.inner().withAdministratorType(administratorType);
+        return this;
+    }
+
+    @Override
+    public ManagedInstanceAdministratorImpl withLogin(String login) {
+        this.inner().withLogin(login);
+        return this;
+    }
+
+    @Override
+    public ManagedInstanceAdministratorImpl withSid(UUID sid) {
+        this.inner().withSid(sid);
+        return this;
+    }
+
+    @Override
+    public ManagedInstanceAdministratorImpl withTenantId(UUID tenantId) {
+        this.inner().withTenantId(tenantId);
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorInner.java
new file mode 100644
index 000000000000..abb92070cfc7
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorInner.java
@@ -0,0 +1,134 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * An Azure SQL managed instance administrator.
+ */
+@JsonFlatten
+public class ManagedInstanceAdministratorInner extends ProxyResource {
+    /**
+     * Type of the managed instance administrator.
+     */
+    @JsonProperty(value = "properties.administratorType", required = true)
+    private String administratorType;
+
+    /**
+     * Login name of the managed instance administrator.
+     */
+    @JsonProperty(value = "properties.login", required = true)
+    private String login;
+
+    /**
+     * SID (object ID) of the managed instance administrator.
+     */
+    @JsonProperty(value = "properties.sid", required = true)
+    private UUID sid;
+
+    /**
+     * Tenant ID of the managed instance administrator.
+     */
+    @JsonProperty(value = "properties.tenantId")
+    private UUID tenantId;
+
+    /**
+     * Creates an instance of ManagedInstanceAdministratorInner class.
+     * @param login login name of the managed instance administrator.
+     * @param sid sID (object ID) of the managed instance administrator.
+     */
+    public ManagedInstanceAdministratorInner() {
+        administratorType = "ActiveDirectory";
+    }
+
+    /**
+     * Get type of the managed instance administrator.
+     *
+     * @return the administratorType value
+     */
+    public String administratorType() {
+        return this.administratorType;
+    }
+
+    /**
+     * Set type of the managed instance administrator.
+     *
+     * @param administratorType the administratorType value to set
+     * @return the ManagedInstanceAdministratorInner object itself.
+     */
+    public ManagedInstanceAdministratorInner withAdministratorType(String administratorType) {
+        this.administratorType = administratorType;
+        return this;
+    }
+
+    /**
+     * Get login name of the managed instance administrator.
+     *
+     * @return the login value
+     */
+    public String login() {
+        return this.login;
+    }
+
+    /**
+     * Set login name of the managed instance administrator.
+     *
+     * @param login the login value to set
+     * @return the ManagedInstanceAdministratorInner object itself.
+     */
+    public ManagedInstanceAdministratorInner withLogin(String login) {
+        this.login = login;
+        return this;
+    }
+
+    /**
+     * Get sID (object ID) of the managed instance administrator.
+     *
+     * @return the sid value
+     */
+    public UUID sid() {
+        return this.sid;
+    }
+
+    /**
+     * Set sID (object ID) of the managed instance administrator.
+     *
+     * @param sid the sid value to set
+     * @return the ManagedInstanceAdministratorInner object itself.
+     */
+    public ManagedInstanceAdministratorInner withSid(UUID sid) {
+        this.sid = sid;
+        return this;
+    }
+
+    /**
+     * Get tenant ID of the managed instance administrator.
+     *
+     * @return the tenantId value
+     */
+    public UUID tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Set tenant ID of the managed instance administrator.
+     *
+     * @param tenantId the tenantId value to set
+     * @return the ManagedInstanceAdministratorInner object itself.
+     */
+    public ManagedInstanceAdministratorInner withTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorsImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorsImpl.java
new file mode 100644
index 000000000000..1323fc1a76f7
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorsImpl.java
@@ -0,0 +1,89 @@
+/**
+ * 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.
+ * abc
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrator;
+import com.microsoft.azure.Page;
+import rx.Completable;
+
+class ManagedInstanceAdministratorsImpl extends WrapperImpl<ManagedInstanceAdministratorsInner> implements ManagedInstanceAdministrators {
+    private final SqlManager manager;
+
+    ManagedInstanceAdministratorsImpl(SqlManager manager) {
+        super(manager.inner().managedInstanceAdministrators());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ManagedInstanceAdministratorImpl defineAdministrator(String name) {
+        return wrapAdministratorModel(name);
+    }
+
+    private ManagedInstanceAdministratorImpl wrapAdministratorModel(String name) {
+        return new ManagedInstanceAdministratorImpl(name, this.manager());
+    }
+
+    private ManagedInstanceAdministratorImpl wrapManagedInstanceAdministratorModel(ManagedInstanceAdministratorInner inner) {
+        return  new ManagedInstanceAdministratorImpl(inner, manager());
+    }
+
+    private Observable<ManagedInstanceAdministratorInner> getManagedInstanceAdministratorInnerUsingManagedInstanceAdministratorsInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String managedInstanceName = IdParsingUtils.getValueFromIdByName(id, "managedInstances");
+        String administratorName = IdParsingUtils.getValueFromIdByName(id, "administrators");
+        ManagedInstanceAdministratorsInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, administratorName);
+    }
+
+    @Override
+    public Observable<ManagedInstanceAdministrator> getAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        ManagedInstanceAdministratorsInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, administratorName)
+        .map(new Func1<ManagedInstanceAdministratorInner, ManagedInstanceAdministrator>() {
+            @Override
+            public ManagedInstanceAdministrator call(ManagedInstanceAdministratorInner inner) {
+                return wrapManagedInstanceAdministratorModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<ManagedInstanceAdministrator> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        ManagedInstanceAdministratorsInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<ManagedInstanceAdministratorInner>, Iterable<ManagedInstanceAdministratorInner>>() {
+            @Override
+            public Iterable<ManagedInstanceAdministratorInner> call(Page<ManagedInstanceAdministratorInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedInstanceAdministratorInner, ManagedInstanceAdministrator>() {
+            @Override
+            public ManagedInstanceAdministrator call(ManagedInstanceAdministratorInner inner) {
+                return wrapManagedInstanceAdministratorModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        ManagedInstanceAdministratorsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, managedInstanceName, administratorName).toCompletable();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorsInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorsInner.java
new file mode 100644
index 000000000000..31b92f7e6324
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedInstanceAdministratorsInner.java
@@ -0,0 +1,776 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ManagedInstanceAdministrators.
+ */
+public class ManagedInstanceAdministratorsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ManagedInstanceAdministratorsService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedInstanceAdministratorsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ManagedInstanceAdministratorsInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(ManagedInstanceAdministratorsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ManagedInstanceAdministrators to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagedInstanceAdministratorsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/administrators")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/administrators/{administratorName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("administratorName") String administratorName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/administrators/{administratorName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("administratorName") String administratorName, @Path("subscriptionId") String subscriptionId, @Body ManagedInstanceAdministratorInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/administrators/{administratorName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("administratorName") String administratorName, @Path("subscriptionId") String subscriptionId, @Body ManagedInstanceAdministratorInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/administrators/{administratorName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("administratorName") String administratorName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/administrators/{administratorName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("administratorName") String administratorName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedInstanceAdministratorInner&gt; object if successful.
+     */
+    public PagedList<ManagedInstanceAdministratorInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<ManagedInstanceAdministratorInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<ManagedInstanceAdministratorInner>(response.body()) {
+            @Override
+            public Page<ManagedInstanceAdministratorInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedInstanceAdministratorInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<ManagedInstanceAdministratorInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceAdministratorInner&gt; object
+     */
+    public Observable<Page<ManagedInstanceAdministratorInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<ManagedInstanceAdministratorInner>>, Page<ManagedInstanceAdministratorInner>>() {
+                @Override
+                public Page<ManagedInstanceAdministratorInner> call(ServiceResponse<Page<ManagedInstanceAdministratorInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceAdministratorInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedInstanceAdministratorInner>>, Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> call(ServiceResponse<Page<ManagedInstanceAdministratorInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+    ServiceResponse<PageImpl<ManagedInstanceAdministratorInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<ManagedInstanceAdministratorInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedInstanceAdministratorInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedInstanceAdministratorInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedInstanceAdministratorInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedInstanceAdministratorInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedInstanceAdministratorInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedInstanceAdministratorInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedInstanceAdministratorInner object if successful.
+     */
+    public ManagedInstanceAdministratorInner get(String resourceGroupName, String managedInstanceName, String administratorName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedInstanceAdministratorInner> getAsync(String resourceGroupName, String managedInstanceName, String administratorName, final ServiceCallback<ManagedInstanceAdministratorInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName), serviceCallback);
+    }
+
+    /**
+     * Gets a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceAdministratorInner object
+     */
+    public Observable<ManagedInstanceAdministratorInner> getAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName).map(new Func1<ServiceResponse<ManagedInstanceAdministratorInner>, ManagedInstanceAdministratorInner>() {
+            @Override
+            public ManagedInstanceAdministratorInner call(ServiceResponse<ManagedInstanceAdministratorInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceAdministratorInner object
+     */
+    public Observable<ServiceResponse<ManagedInstanceAdministratorInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (administratorName == null) {
+            throw new IllegalArgumentException("Parameter administratorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(resourceGroupName, managedInstanceName, administratorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedInstanceAdministratorInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedInstanceAdministratorInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedInstanceAdministratorInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedInstanceAdministratorInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedInstanceAdministratorInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedInstanceAdministratorInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedInstanceAdministratorInner object if successful.
+     */
+    public ManagedInstanceAdministratorInner createOrUpdate(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedInstanceAdministratorInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters, final ServiceCallback<ManagedInstanceAdministratorInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedInstanceAdministratorInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName, parameters).map(new Func1<ServiceResponse<ManagedInstanceAdministratorInner>, ManagedInstanceAdministratorInner>() {
+            @Override
+            public ManagedInstanceAdministratorInner call(ServiceResponse<ManagedInstanceAdministratorInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedInstanceAdministratorInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (administratorName == null) {
+            throw new IllegalArgumentException("Parameter administratorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, managedInstanceName, administratorName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedInstanceAdministratorInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedInstanceAdministratorInner object if successful.
+     */
+    public ManagedInstanceAdministratorInner beginCreateOrUpdate(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedInstanceAdministratorInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters, final ServiceCallback<ManagedInstanceAdministratorInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceAdministratorInner object
+     */
+    public Observable<ManagedInstanceAdministratorInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName, parameters).map(new Func1<ServiceResponse<ManagedInstanceAdministratorInner>, ManagedInstanceAdministratorInner>() {
+            @Override
+            public ManagedInstanceAdministratorInner call(ServiceResponse<ManagedInstanceAdministratorInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The requested administrator name.
+     * @param parameters The requested administrator parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceAdministratorInner object
+     */
+    public Observable<ServiceResponse<ManagedInstanceAdministratorInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String administratorName, ManagedInstanceAdministratorInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (administratorName == null) {
+            throw new IllegalArgumentException("Parameter administratorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreateOrUpdate(resourceGroupName, managedInstanceName, administratorName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedInstanceAdministratorInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedInstanceAdministratorInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedInstanceAdministratorInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedInstanceAdministratorInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedInstanceAdministratorInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedInstanceAdministratorInner>() { }.getType())
+                .register(201, new TypeToken<ManagedInstanceAdministratorInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String managedInstanceName, String administratorName) {
+        deleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> deleteAsync(String resourceGroupName, String managedInstanceName, String administratorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName), serviceCallback);
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (administratorName == null) {
+            throw new IllegalArgumentException("Parameter administratorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, managedInstanceName, administratorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginDelete(String resourceGroupName, String managedInstanceName, String administratorName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String managedInstanceName, String administratorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName), serviceCallback);
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, administratorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a managed instance administrator.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param administratorName The administrator name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String administratorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (administratorName == null) {
+            throw new IllegalArgumentException("Parameter administratorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.beginDelete(resourceGroupName, managedInstanceName, administratorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedInstanceAdministratorInner&gt; object if successful.
+     */
+    public PagedList<ManagedInstanceAdministratorInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedInstanceAdministratorInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedInstanceAdministratorInner>(response.body()) {
+            @Override
+            public Page<ManagedInstanceAdministratorInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedInstanceAdministratorInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedInstanceAdministratorInner>> serviceFuture, final ListOperationCallback<ManagedInstanceAdministratorInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceAdministratorInner&gt; object
+     */
+    public Observable<Page<ManagedInstanceAdministratorInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedInstanceAdministratorInner>>, Page<ManagedInstanceAdministratorInner>>() {
+                @Override
+                public Page<ManagedInstanceAdministratorInner> call(ServiceResponse<Page<ManagedInstanceAdministratorInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceAdministratorInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedInstanceAdministratorInner>>, Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> call(ServiceResponse<Page<ManagedInstanceAdministratorInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance administrators.
+     *
+    ServiceResponse<PageImpl<ManagedInstanceAdministratorInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedInstanceAdministratorInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> listByInstanceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceAdministratorInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedInstanceAdministratorInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedInstanceAdministratorInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedInstanceAdministratorInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedInstanceAdministratorInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedInstanceAdministratorInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImpl.java
new file mode 100644
index 000000000000..38e3c577867b
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImpl.java
@@ -0,0 +1,74 @@
+/**
+ * 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.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy;
+
+class ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImpl extends WrapperImpl<ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner> implements ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies {
+    private final SqlManager manager;
+
+    ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImpl(SqlManager manager) {
+        super(manager.inner().managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl wrapModel(ManagedBackupShortTermRetentionPolicyInner inner) {
+        return  new RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(inner, manager());
+    }
+
+    private RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl wrapModel(String name) {
+        return new RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> listByRestorableDroppedDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String restorableDroppedDatabaseId) {
+        ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner client = this.inner();
+        return client.listByRestorableDroppedDatabaseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId)
+        .flatMapIterable(new Func1<Page<ManagedBackupShortTermRetentionPolicyInner>, Iterable<ManagedBackupShortTermRetentionPolicyInner>>() {
+            @Override
+            public Iterable<ManagedBackupShortTermRetentionPolicyInner> call(Page<ManagedBackupShortTermRetentionPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedBackupShortTermRetentionPolicyInner, RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>() {
+            @Override
+            public RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy call(ManagedBackupShortTermRetentionPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId)
+        .map(new Func1<ManagedBackupShortTermRetentionPolicyInner, RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy>() {
+            @Override
+            public RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy call(ManagedBackupShortTermRetentionPolicyInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner.java
new file mode 100644
index 000000000000..94498c7b4c6f
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner.java
@@ -0,0 +1,1135 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies.
+ */
+public class ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner {
+    /** The Retrofit service to perform REST calls. */
+    private ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}/backupShortTermRetentionPolicies/{policyName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("restorableDroppedDatabaseId") String restorableDroppedDatabaseId, @Path("policyName") String policyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}/backupShortTermRetentionPolicies/{policyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("restorableDroppedDatabaseId") String restorableDroppedDatabaseId, @Path("policyName") String policyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ManagedBackupShortTermRetentionPolicyInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}/backupShortTermRetentionPolicies/{policyName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("restorableDroppedDatabaseId") String restorableDroppedDatabaseId, @Path("policyName") String policyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ManagedBackupShortTermRetentionPolicyInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies update" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}/backupShortTermRetentionPolicies/{policyName}")
+        Observable<Response<ResponseBody>> update(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("restorableDroppedDatabaseId") String restorableDroppedDatabaseId, @Path("policyName") String policyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ManagedBackupShortTermRetentionPolicyInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies beginUpdate" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}/backupShortTermRetentionPolicies/{policyName}")
+        Observable<Response<ResponseBody>> beginUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("restorableDroppedDatabaseId") String restorableDroppedDatabaseId, @Path("policyName") String policyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ManagedBackupShortTermRetentionPolicyInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies listByRestorableDroppedDatabase" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}/backupShortTermRetentionPolicies")
+        Observable<Response<ResponseBody>> listByRestorableDroppedDatabase(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("restorableDroppedDatabaseId") String restorableDroppedDatabaseId, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies listByRestorableDroppedDatabaseNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByRestorableDroppedDatabaseNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner get(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId), serviceCallback);
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        return service.get(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedBackupShortTermRetentionPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedBackupShortTermRetentionPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner createOrUpdate(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).toBlocking().last().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        final Integer retentionDays = null;
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(null);
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedBackupShortTermRetentionPolicyInner>() { }.getType());
+    }
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner createOrUpdate(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).toBlocking().last().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(retentionDays);
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedBackupShortTermRetentionPolicyInner>() { }.getType());
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner beginCreateOrUpdate(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).toBlocking().single().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        final Integer retentionDays = null;
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(null);
+        return service.beginCreateOrUpdate(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner beginCreateOrUpdate(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).toBlocking().single().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(retentionDays);
+        return service.beginCreateOrUpdate(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedBackupShortTermRetentionPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedBackupShortTermRetentionPolicyInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner update(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return updateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).toBlocking().last().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> updateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> updateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return updateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> updateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        final Integer retentionDays = null;
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(null);
+        Observable<Response<ResponseBody>> observable = service.update(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedBackupShortTermRetentionPolicyInner>() { }.getType());
+    }
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner update(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return updateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).toBlocking().last().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> updateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> updateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return updateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> updateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(retentionDays);
+        Observable<Response<ResponseBody>> observable = service.update(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedBackupShortTermRetentionPolicyInner>() { }.getType());
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner beginUpdate(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).toBlocking().single().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> beginUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> beginUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> beginUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        final Integer retentionDays = null;
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(null);
+        return service.beginUpdate(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> clientResponse = beginUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedBackupShortTermRetentionPolicyInner object if successful.
+     */
+    public ManagedBackupShortTermRetentionPolicyInner beginUpdate(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).toBlocking().single().body();
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedBackupShortTermRetentionPolicyInner> beginUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays, final ServiceCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays), serviceCallback);
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ManagedBackupShortTermRetentionPolicyInner> beginUpdateAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, retentionDays).map(new Func1<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>, ManagedBackupShortTermRetentionPolicyInner>() {
+            @Override
+            public ManagedBackupShortTermRetentionPolicyInner call(ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Sets a database's long term retention policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param retentionDays The backup retention period in days. This is how many days Point-in-Time Restore will be supported.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedBackupShortTermRetentionPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> beginUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, Integer retentionDays) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String policyName = "default";
+        ManagedBackupShortTermRetentionPolicyInner parameters = new ManagedBackupShortTermRetentionPolicyInner();
+        parameters.withRetentionDays(retentionDays);
+        return service.beginUpdate(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, policyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedBackupShortTermRetentionPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> clientResponse = beginUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedBackupShortTermRetentionPolicyInner> beginUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedBackupShortTermRetentionPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedBackupShortTermRetentionPolicyInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object if successful.
+     */
+    public PagedList<ManagedBackupShortTermRetentionPolicyInner> listByRestorableDroppedDatabase(final String resourceGroupName, final String managedInstanceName, final String restorableDroppedDatabaseId) {
+        ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>> response = listByRestorableDroppedDatabaseSinglePageAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).toBlocking().single();
+        return new PagedList<ManagedBackupShortTermRetentionPolicyInner>(response.body()) {
+            @Override
+            public Page<ManagedBackupShortTermRetentionPolicyInner> nextPage(String nextPageLink) {
+                return listByRestorableDroppedDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedBackupShortTermRetentionPolicyInner>> listByRestorableDroppedDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String restorableDroppedDatabaseId, final ListOperationCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByRestorableDroppedDatabaseSinglePageAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> call(String nextPageLink) {
+                    return listByRestorableDroppedDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object
+     */
+    public Observable<Page<ManagedBackupShortTermRetentionPolicyInner>> listByRestorableDroppedDatabaseAsync(final String resourceGroupName, final String managedInstanceName, final String restorableDroppedDatabaseId) {
+        return listByRestorableDroppedDatabaseWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId)
+            .map(new Func1<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>, Page<ManagedBackupShortTermRetentionPolicyInner>>() {
+                @Override
+                public Page<ManagedBackupShortTermRetentionPolicyInner> call(ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> listByRestorableDroppedDatabaseWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName, final String restorableDroppedDatabaseId) {
+        return listByRestorableDroppedDatabaseSinglePageAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>, Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> call(ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByRestorableDroppedDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+    ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> * @param managedInstanceName The name of the managed instance.
+    ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> listByRestorableDroppedDatabaseSinglePageAsync(final String resourceGroupName, final String managedInstanceName, final String restorableDroppedDatabaseId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByRestorableDroppedDatabase(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> result = listByRestorableDroppedDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> listByRestorableDroppedDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedBackupShortTermRetentionPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedBackupShortTermRetentionPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object if successful.
+     */
+    public PagedList<ManagedBackupShortTermRetentionPolicyInner> listByRestorableDroppedDatabaseNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>> response = listByRestorableDroppedDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedBackupShortTermRetentionPolicyInner>(response.body()) {
+            @Override
+            public Page<ManagedBackupShortTermRetentionPolicyInner> nextPage(String nextPageLink) {
+                return listByRestorableDroppedDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedBackupShortTermRetentionPolicyInner>> listByRestorableDroppedDatabaseNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedBackupShortTermRetentionPolicyInner>> serviceFuture, final ListOperationCallback<ManagedBackupShortTermRetentionPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByRestorableDroppedDatabaseNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> call(String nextPageLink) {
+                    return listByRestorableDroppedDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object
+     */
+    public Observable<Page<ManagedBackupShortTermRetentionPolicyInner>> listByRestorableDroppedDatabaseNextAsync(final String nextPageLink) {
+        return listByRestorableDroppedDatabaseNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>, Page<ManagedBackupShortTermRetentionPolicyInner>>() {
+                @Override
+                public Page<ManagedBackupShortTermRetentionPolicyInner> call(ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> listByRestorableDroppedDatabaseNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByRestorableDroppedDatabaseNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>, Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> call(ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByRestorableDroppedDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a dropped database's short term retention policy list.
+     *
+    ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedBackupShortTermRetentionPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> listByRestorableDroppedDatabaseNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByRestorableDroppedDatabaseNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> result = listByRestorableDroppedDatabaseNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedBackupShortTermRetentionPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedBackupShortTermRetentionPolicyInner>> listByRestorableDroppedDatabaseNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedBackupShortTermRetentionPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedBackupShortTermRetentionPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPoliciesImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPoliciesImpl.java
new file mode 100644
index 000000000000..81992c52c9cc
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPoliciesImpl.java
@@ -0,0 +1,81 @@
+/**
+ * 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.
+ * abc
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicies;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicy;
+import com.microsoft.azure.Page;
+
+class ManagedServerSecurityAlertPoliciesImpl extends WrapperImpl<ManagedServerSecurityAlertPoliciesInner> implements ManagedServerSecurityAlertPolicies {
+    private final SqlManager manager;
+
+    ManagedServerSecurityAlertPoliciesImpl(SqlManager manager) {
+        super(manager.inner().managedServerSecurityAlertPolicies());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl defineSecurityAlertPolicy(String name) {
+        return wrapSecurityAlertPolicyModel(name);
+    }
+
+    private ManagedServerSecurityAlertPolicyImpl wrapSecurityAlertPolicyModel(String name) {
+        return new ManagedServerSecurityAlertPolicyImpl(name, this.manager());
+    }
+
+    private ManagedServerSecurityAlertPolicyImpl wrapManagedServerSecurityAlertPolicyModel(ManagedServerSecurityAlertPolicyInner inner) {
+        return  new ManagedServerSecurityAlertPolicyImpl(inner, manager());
+    }
+
+    private Observable<ManagedServerSecurityAlertPolicyInner> getManagedServerSecurityAlertPolicyInnerUsingManagedServerSecurityAlertPoliciesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String managedInstanceName = IdParsingUtils.getValueFromIdByName(id, "managedInstances");
+        ManagedServerSecurityAlertPoliciesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName);
+    }
+
+    @Override
+    public Observable<ManagedServerSecurityAlertPolicy> getAsync(String resourceGroupName, String managedInstanceName) {
+        ManagedServerSecurityAlertPoliciesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName)
+        .map(new Func1<ManagedServerSecurityAlertPolicyInner, ManagedServerSecurityAlertPolicy>() {
+            @Override
+            public ManagedServerSecurityAlertPolicy call(ManagedServerSecurityAlertPolicyInner inner) {
+                return wrapManagedServerSecurityAlertPolicyModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<ManagedServerSecurityAlertPolicy> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        ManagedServerSecurityAlertPoliciesInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<ManagedServerSecurityAlertPolicyInner>, Iterable<ManagedServerSecurityAlertPolicyInner>>() {
+            @Override
+            public Iterable<ManagedServerSecurityAlertPolicyInner> call(Page<ManagedServerSecurityAlertPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedServerSecurityAlertPolicyInner, ManagedServerSecurityAlertPolicy>() {
+            @Override
+            public ManagedServerSecurityAlertPolicy call(ManagedServerSecurityAlertPolicyInner inner) {
+                return wrapManagedServerSecurityAlertPolicyModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPoliciesInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPoliciesInner.java
new file mode 100644
index 000000000000..0382e0c34a81
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPoliciesInner.java
@@ -0,0 +1,580 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ManagedServerSecurityAlertPolicies.
+ */
+public class ManagedServerSecurityAlertPoliciesInner {
+    /** The Retrofit service to perform REST calls. */
+    private ManagedServerSecurityAlertPoliciesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedServerSecurityAlertPoliciesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ManagedServerSecurityAlertPoliciesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(ManagedServerSecurityAlertPoliciesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ManagedServerSecurityAlertPolicies to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagedServerSecurityAlertPoliciesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicies get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/securityAlertPolicies/{securityAlertPolicyName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("securityAlertPolicyName") String securityAlertPolicyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicies createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/securityAlertPolicies/{securityAlertPolicyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("securityAlertPolicyName") String securityAlertPolicyName, @Path("subscriptionId") String subscriptionId, @Body ManagedServerSecurityAlertPolicyInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicies beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/securityAlertPolicies/{securityAlertPolicyName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("securityAlertPolicyName") String securityAlertPolicyName, @Path("subscriptionId") String subscriptionId, @Body ManagedServerSecurityAlertPolicyInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicies listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/securityAlertPolicies")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicies listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Get a managed server's threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedServerSecurityAlertPolicyInner object if successful.
+     */
+    public ManagedServerSecurityAlertPolicyInner get(String resourceGroupName, String managedInstanceName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a managed server's threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedServerSecurityAlertPolicyInner> getAsync(String resourceGroupName, String managedInstanceName, final ServiceCallback<ManagedServerSecurityAlertPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName), serviceCallback);
+    }
+
+    /**
+     * Get a managed server's threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedServerSecurityAlertPolicyInner object
+     */
+    public Observable<ManagedServerSecurityAlertPolicyInner> getAsync(String resourceGroupName, String managedInstanceName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName).map(new Func1<ServiceResponse<ManagedServerSecurityAlertPolicyInner>, ManagedServerSecurityAlertPolicyInner>() {
+            @Override
+            public ManagedServerSecurityAlertPolicyInner call(ServiceResponse<ManagedServerSecurityAlertPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a managed server's threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedServerSecurityAlertPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedServerSecurityAlertPolicyInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String securityAlertPolicyName = "Default";
+        return service.get(resourceGroupName, managedInstanceName, securityAlertPolicyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedServerSecurityAlertPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedServerSecurityAlertPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedServerSecurityAlertPolicyInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedServerSecurityAlertPolicyInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedServerSecurityAlertPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedServerSecurityAlertPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedServerSecurityAlertPolicyInner object if successful.
+     */
+    public ManagedServerSecurityAlertPolicyInner createOrUpdate(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedServerSecurityAlertPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters, final ServiceCallback<ManagedServerSecurityAlertPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedServerSecurityAlertPolicyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).map(new Func1<ServiceResponse<ManagedServerSecurityAlertPolicyInner>, ManagedServerSecurityAlertPolicyInner>() {
+            @Override
+            public ManagedServerSecurityAlertPolicyInner call(ServiceResponse<ManagedServerSecurityAlertPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedServerSecurityAlertPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String securityAlertPolicyName = "Default";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, managedInstanceName, securityAlertPolicyName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedServerSecurityAlertPolicyInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ManagedServerSecurityAlertPolicyInner object if successful.
+     */
+    public ManagedServerSecurityAlertPolicyInner beginCreateOrUpdate(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ManagedServerSecurityAlertPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters, final ServiceCallback<ManagedServerSecurityAlertPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedServerSecurityAlertPolicyInner object
+     */
+    public Observable<ManagedServerSecurityAlertPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).map(new Func1<ServiceResponse<ManagedServerSecurityAlertPolicyInner>, ManagedServerSecurityAlertPolicyInner>() {
+            @Override
+            public ManagedServerSecurityAlertPolicyInner call(ServiceResponse<ManagedServerSecurityAlertPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a threat detection policy.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The managed server security alert policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedServerSecurityAlertPolicyInner object
+     */
+    public Observable<ServiceResponse<ManagedServerSecurityAlertPolicyInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, ManagedServerSecurityAlertPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String securityAlertPolicyName = "Default";
+        return service.beginCreateOrUpdate(resourceGroupName, managedInstanceName, securityAlertPolicyName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedServerSecurityAlertPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedServerSecurityAlertPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedServerSecurityAlertPolicyInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedServerSecurityAlertPolicyInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedServerSecurityAlertPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedServerSecurityAlertPolicyInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object if successful.
+     */
+    public PagedList<ManagedServerSecurityAlertPolicyInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<ManagedServerSecurityAlertPolicyInner>(response.body()) {
+            @Override
+            public Page<ManagedServerSecurityAlertPolicyInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedServerSecurityAlertPolicyInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<ManagedServerSecurityAlertPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<Page<ManagedServerSecurityAlertPolicyInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>, Page<ManagedServerSecurityAlertPolicyInner>>() {
+                @Override
+                public Page<ManagedServerSecurityAlertPolicyInner> call(ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>, Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> call(ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+    ServiceResponse<PageImpl<ManagedServerSecurityAlertPolicyInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<ManagedServerSecurityAlertPolicyInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedServerSecurityAlertPolicyInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedServerSecurityAlertPolicyInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedServerSecurityAlertPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedServerSecurityAlertPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object if successful.
+     */
+    public PagedList<ManagedServerSecurityAlertPolicyInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedServerSecurityAlertPolicyInner>(response.body()) {
+            @Override
+            public Page<ManagedServerSecurityAlertPolicyInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedServerSecurityAlertPolicyInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedServerSecurityAlertPolicyInner>> serviceFuture, final ListOperationCallback<ManagedServerSecurityAlertPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<Page<ManagedServerSecurityAlertPolicyInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>, Page<ManagedServerSecurityAlertPolicyInner>>() {
+                @Override
+                public Page<ManagedServerSecurityAlertPolicyInner> call(ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>, Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> call(ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get the managed server's threat detection policies.
+     *
+    ServiceResponse<PageImpl<ManagedServerSecurityAlertPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedServerSecurityAlertPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> listByInstanceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedServerSecurityAlertPolicyInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedServerSecurityAlertPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedServerSecurityAlertPolicyInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedServerSecurityAlertPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedServerSecurityAlertPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPolicyImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPolicyImpl.java
new file mode 100644
index 000000000000..58aa87677cfd
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPolicyImpl.java
@@ -0,0 +1,177 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicy;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SecurityAlertPolicyState;
+import java.util.List;
+import org.joda.time.DateTime;
+
+class ManagedServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ManagedServerSecurityAlertPolicy, ManagedServerSecurityAlertPolicyInner, ManagedServerSecurityAlertPolicyImpl> implements ManagedServerSecurityAlertPolicy, ManagedServerSecurityAlertPolicy.Definition, ManagedServerSecurityAlertPolicy.Update {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+
+    ManagedServerSecurityAlertPolicyImpl(String name, SqlManager manager) {
+        super(name, new ManagedServerSecurityAlertPolicyInner());
+        this.manager = manager;
+        // Set resource name
+        this.managedInstanceName = name;
+        //
+    }
+
+    ManagedServerSecurityAlertPolicyImpl(ManagedServerSecurityAlertPolicyInner inner, SqlManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.managedInstanceName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        //
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ManagedServerSecurityAlertPolicy> createResourceAsync() {
+        ManagedServerSecurityAlertPoliciesInner client = this.manager().inner().managedServerSecurityAlertPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ManagedServerSecurityAlertPolicy> updateResourceAsync() {
+        ManagedServerSecurityAlertPoliciesInner client = this.manager().inner().managedServerSecurityAlertPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ManagedServerSecurityAlertPolicyInner> getInnerAsync() {
+        ManagedServerSecurityAlertPoliciesInner client = this.manager().inner().managedServerSecurityAlertPolicies();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public DateTime creationTime() {
+        return this.inner().creationTime();
+    }
+
+    @Override
+    public List<String> disabledAlerts() {
+        return this.inner().disabledAlerts();
+    }
+
+    @Override
+    public Boolean emailAccountAdmins() {
+        return this.inner().emailAccountAdmins();
+    }
+
+    @Override
+    public List<String> emailAddresses() {
+        return this.inner().emailAddresses();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer retentionDays() {
+        return this.inner().retentionDays();
+    }
+
+    @Override
+    public SecurityAlertPolicyState state() {
+        return this.inner().state();
+    }
+
+    @Override
+    public String storageAccountAccessKey() {
+        return this.inner().storageAccountAccessKey();
+    }
+
+    @Override
+    public String storageEndpoint() {
+        return this.inner().storageEndpoint();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withExistingManagedInstance(String resourceGroupName, String managedInstanceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.managedInstanceName = managedInstanceName;
+        return this;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withState(SecurityAlertPolicyState state) {
+        this.inner().withState(state);
+        return this;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withDisabledAlerts(List<String> disabledAlerts) {
+        this.inner().withDisabledAlerts(disabledAlerts);
+        return this;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withEmailAccountAdmins(Boolean emailAccountAdmins) {
+        this.inner().withEmailAccountAdmins(emailAccountAdmins);
+        return this;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withEmailAddresses(List<String> emailAddresses) {
+        this.inner().withEmailAddresses(emailAddresses);
+        return this;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withRetentionDays(Integer retentionDays) {
+        this.inner().withRetentionDays(retentionDays);
+        return this;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withStorageAccountAccessKey(String storageAccountAccessKey) {
+        this.inner().withStorageAccountAccessKey(storageAccountAccessKey);
+        return this;
+    }
+
+    @Override
+    public ManagedServerSecurityAlertPolicyImpl withStorageEndpoint(String storageEndpoint) {
+        this.inner().withStorageEndpoint(storageEndpoint);
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPolicyInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPolicyInner.java
new file mode 100644
index 000000000000..9ab378c25922
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ManagedServerSecurityAlertPolicyInner.java
@@ -0,0 +1,227 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SecurityAlertPolicyState;
+import java.util.List;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A managed server security alert policy.
+ */
+@JsonFlatten
+public class ManagedServerSecurityAlertPolicyInner extends ProxyResource {
+    /**
+     * Specifies the state of the policy, whether it is enabled or disabled or
+     * a policy has not been applied yet on the specific database. Possible
+     * values include: 'New', 'Enabled', 'Disabled'.
+     */
+    @JsonProperty(value = "properties.state", required = true)
+    private SecurityAlertPolicyState state;
+
+    /**
+     * Specifies an array of alerts that are disabled. Allowed values are:
+     * Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly,
+     * Data_Exfiltration, Unsafe_Action.
+     */
+    @JsonProperty(value = "properties.disabledAlerts")
+    private List<String> disabledAlerts;
+
+    /**
+     * Specifies an array of e-mail addresses to which the alert is sent.
+     */
+    @JsonProperty(value = "properties.emailAddresses")
+    private List<String> emailAddresses;
+
+    /**
+     * Specifies that the alert is sent to the account administrators.
+     */
+    @JsonProperty(value = "properties.emailAccountAdmins")
+    private Boolean emailAccountAdmins;
+
+    /**
+     * Specifies the blob storage endpoint (e.g.
+     * https://MyAccount.blob.core.windows.net). This blob storage will hold
+     * all Threat Detection audit logs.
+     */
+    @JsonProperty(value = "properties.storageEndpoint")
+    private String storageEndpoint;
+
+    /**
+     * Specifies the identifier key of the Threat Detection audit storage
+     * account.
+     */
+    @JsonProperty(value = "properties.storageAccountAccessKey")
+    private String storageAccountAccessKey;
+
+    /**
+     * Specifies the number of days to keep in the Threat Detection audit logs.
+     */
+    @JsonProperty(value = "properties.retentionDays")
+    private Integer retentionDays;
+
+    /**
+     * Specifies the UTC creation time of the policy.
+     */
+    @JsonProperty(value = "properties.creationTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime creationTime;
+
+    /**
+     * Get specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'.
+     *
+     * @return the state value
+     */
+    public SecurityAlertPolicyState state() {
+        return this.state;
+    }
+
+    /**
+     * Set specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'.
+     *
+     * @param state the state value to set
+     * @return the ManagedServerSecurityAlertPolicyInner object itself.
+     */
+    public ManagedServerSecurityAlertPolicyInner withState(SecurityAlertPolicyState state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action.
+     *
+     * @return the disabledAlerts value
+     */
+    public List<String> disabledAlerts() {
+        return this.disabledAlerts;
+    }
+
+    /**
+     * Set specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action.
+     *
+     * @param disabledAlerts the disabledAlerts value to set
+     * @return the ManagedServerSecurityAlertPolicyInner object itself.
+     */
+    public ManagedServerSecurityAlertPolicyInner withDisabledAlerts(List<String> disabledAlerts) {
+        this.disabledAlerts = disabledAlerts;
+        return this;
+    }
+
+    /**
+     * Get specifies an array of e-mail addresses to which the alert is sent.
+     *
+     * @return the emailAddresses value
+     */
+    public List<String> emailAddresses() {
+        return this.emailAddresses;
+    }
+
+    /**
+     * Set specifies an array of e-mail addresses to which the alert is sent.
+     *
+     * @param emailAddresses the emailAddresses value to set
+     * @return the ManagedServerSecurityAlertPolicyInner object itself.
+     */
+    public ManagedServerSecurityAlertPolicyInner withEmailAddresses(List<String> emailAddresses) {
+        this.emailAddresses = emailAddresses;
+        return this;
+    }
+
+    /**
+     * Get specifies that the alert is sent to the account administrators.
+     *
+     * @return the emailAccountAdmins value
+     */
+    public Boolean emailAccountAdmins() {
+        return this.emailAccountAdmins;
+    }
+
+    /**
+     * Set specifies that the alert is sent to the account administrators.
+     *
+     * @param emailAccountAdmins the emailAccountAdmins value to set
+     * @return the ManagedServerSecurityAlertPolicyInner object itself.
+     */
+    public ManagedServerSecurityAlertPolicyInner withEmailAccountAdmins(Boolean emailAccountAdmins) {
+        this.emailAccountAdmins = emailAccountAdmins;
+        return this;
+    }
+
+    /**
+     * Get specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs.
+     *
+     * @return the storageEndpoint value
+     */
+    public String storageEndpoint() {
+        return this.storageEndpoint;
+    }
+
+    /**
+     * Set specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs.
+     *
+     * @param storageEndpoint the storageEndpoint value to set
+     * @return the ManagedServerSecurityAlertPolicyInner object itself.
+     */
+    public ManagedServerSecurityAlertPolicyInner withStorageEndpoint(String storageEndpoint) {
+        this.storageEndpoint = storageEndpoint;
+        return this;
+    }
+
+    /**
+     * Get specifies the identifier key of the Threat Detection audit storage account.
+     *
+     * @return the storageAccountAccessKey value
+     */
+    public String storageAccountAccessKey() {
+        return this.storageAccountAccessKey;
+    }
+
+    /**
+     * Set specifies the identifier key of the Threat Detection audit storage account.
+     *
+     * @param storageAccountAccessKey the storageAccountAccessKey value to set
+     * @return the ManagedServerSecurityAlertPolicyInner object itself.
+     */
+    public ManagedServerSecurityAlertPolicyInner withStorageAccountAccessKey(String storageAccountAccessKey) {
+        this.storageAccountAccessKey = storageAccountAccessKey;
+        return this;
+    }
+
+    /**
+     * Get specifies the number of days to keep in the Threat Detection audit logs.
+     *
+     * @return the retentionDays value
+     */
+    public Integer retentionDays() {
+        return this.retentionDays;
+    }
+
+    /**
+     * Set specifies the number of days to keep in the Threat Detection audit logs.
+     *
+     * @param retentionDays the retentionDays value to set
+     * @return the ManagedServerSecurityAlertPolicyInner object itself.
+     */
+    public ManagedServerSecurityAlertPolicyInner withRetentionDays(Integer retentionDays) {
+        this.retentionDays = retentionDays;
+        return this;
+    }
+
+    /**
+     * Get specifies the UTC creation time of the policy.
+     *
+     * @return the creationTime value
+     */
+    public DateTime creationTime() {
+        return this.creationTime;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RecommendedSensitivityLabelsImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RecommendedSensitivityLabelsImpl.java
new file mode 100644
index 000000000000..8bbe2a989a9a
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RecommendedSensitivityLabelsImpl.java
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RecommendedSensitivityLabels;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabasisServerSensitivityLabelModel;
+
+class RecommendedSensitivityLabelsImpl extends WrapperImpl<RecommendedSensitivityLabelsInner> implements RecommendedSensitivityLabels {
+    private final SqlManager manager;
+
+    RecommendedSensitivityLabelsImpl(SqlManager manager) {
+        super(manager.inner().recommendedSensitivityLabels());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    private DatabasisServerSensitivityLabelModelImpl wrapModel(SensitivityLabelInner inner) {
+        return  new DatabasisServerSensitivityLabelModelImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<DatabasisServerSensitivityLabelModel> listByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        RecommendedSensitivityLabelsInner client = this.inner();
+        return client.listByDatabaseAsync(resourceGroupName, serverName, databaseName)
+        .flatMapIterable(new Func1<Page<SensitivityLabelInner>, Iterable<SensitivityLabelInner>>() {
+            @Override
+            public Iterable<SensitivityLabelInner> call(Page<SensitivityLabelInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SensitivityLabelInner, DatabasisServerSensitivityLabelModel>() {
+            @Override
+            public DatabasisServerSensitivityLabelModel call(SensitivityLabelInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RecommendedSensitivityLabelsInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RecommendedSensitivityLabelsInner.java
new file mode 100644
index 000000000000..4bb7bd6f597b
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RecommendedSensitivityLabelsInner.java
@@ -0,0 +1,453 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in RecommendedSensitivityLabels.
+ */
+public class RecommendedSensitivityLabelsInner {
+    /** The Retrofit service to perform REST calls. */
+    private RecommendedSensitivityLabelsService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RecommendedSensitivityLabelsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RecommendedSensitivityLabelsInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(RecommendedSensitivityLabelsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RecommendedSensitivityLabels to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RecommendedSensitivityLabelsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.RecommendedSensitivityLabels listByDatabase" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/recommendedSensitivityLabels")
+        Observable<Response<ResponseBody>> listByDatabase(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Path("subscriptionId") String subscriptionId, @Query("includeDisabledRecommendations") Boolean includeDisabledRecommendations, @Query("$skipToken") String skipToken, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.RecommendedSensitivityLabels listByDatabaseNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByDatabaseNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object if successful.
+     */
+    public PagedList<SensitivityLabelInner> listByDatabase(final String resourceGroupName, final String serverName, final String databaseName) {
+        ServiceResponse<Page<SensitivityLabelInner>> response = listByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName).toBlocking().single();
+        return new PagedList<SensitivityLabelInner>(response.body()) {
+            @Override
+            public Page<SensitivityLabelInner> nextPage(String nextPageLink) {
+                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<SensitivityLabelInner>> listByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName, final ListOperationCallback<SensitivityLabelInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName),
+            new Func1<String, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(String nextPageLink) {
+                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<Page<SensitivityLabelInner>> listByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        return listByDatabaseWithServiceResponseAsync(resourceGroupName, serverName, databaseName)
+            .map(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Page<SensitivityLabelInner>>() {
+                @Override
+                public Page<SensitivityLabelInner> call(ServiceResponse<Page<SensitivityLabelInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listByDatabaseWithServiceResponseAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        return listByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName)
+            .concatMap(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(ServiceResponse<Page<SensitivityLabelInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listByDatabaseSinglePageAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Boolean includeDisabledRecommendations = null;
+        final String skipToken = null;
+        final String filter = null;
+        return service.listByDatabase(resourceGroupName, serverName, databaseName, this.client.subscriptionId(), includeDisabledRecommendations, skipToken, filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SensitivityLabelInner>> result = listByDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SensitivityLabelInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param includeDisabledRecommendations Specifies whether to include disabled recommendations or not.
+     * @param skipToken the String value
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object if successful.
+     */
+    public PagedList<SensitivityLabelInner> listByDatabase(final String resourceGroupName, final String serverName, final String databaseName, final Boolean includeDisabledRecommendations, final String skipToken, final String filter) {
+        ServiceResponse<Page<SensitivityLabelInner>> response = listByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName, includeDisabledRecommendations, skipToken, filter).toBlocking().single();
+        return new PagedList<SensitivityLabelInner>(response.body()) {
+            @Override
+            public Page<SensitivityLabelInner> nextPage(String nextPageLink) {
+                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param includeDisabledRecommendations Specifies whether to include disabled recommendations or not.
+     * @param skipToken the String value
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<SensitivityLabelInner>> listByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName, final Boolean includeDisabledRecommendations, final String skipToken, final String filter, final ListOperationCallback<SensitivityLabelInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName, includeDisabledRecommendations, skipToken, filter),
+            new Func1<String, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(String nextPageLink) {
+                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param includeDisabledRecommendations Specifies whether to include disabled recommendations or not.
+     * @param skipToken the String value
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<Page<SensitivityLabelInner>> listByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName, final Boolean includeDisabledRecommendations, final String skipToken, final String filter) {
+        return listByDatabaseWithServiceResponseAsync(resourceGroupName, serverName, databaseName, includeDisabledRecommendations, skipToken, filter)
+            .map(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Page<SensitivityLabelInner>>() {
+                @Override
+                public Page<SensitivityLabelInner> call(ServiceResponse<Page<SensitivityLabelInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param includeDisabledRecommendations Specifies whether to include disabled recommendations or not.
+     * @param skipToken the String value
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listByDatabaseWithServiceResponseAsync(final String resourceGroupName, final String serverName, final String databaseName, final Boolean includeDisabledRecommendations, final String skipToken, final String filter) {
+        return listByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName, includeDisabledRecommendations, skipToken, filter)
+            .concatMap(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(ServiceResponse<Page<SensitivityLabelInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param serverName The name of the server.
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param databaseName The name of the database.
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param includeDisabledRecommendations Specifies whether to include disabled recommendations or not.
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param skipToken the String value
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listByDatabaseSinglePageAsync(final String resourceGroupName, final String serverName, final String databaseName, final Boolean includeDisabledRecommendations, final String skipToken, final String filter) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByDatabase(resourceGroupName, serverName, databaseName, this.client.subscriptionId(), includeDisabledRecommendations, skipToken, filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SensitivityLabelInner>> result = listByDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SensitivityLabelInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SensitivityLabelInner>> listByDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SensitivityLabelInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SensitivityLabelInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object if successful.
+     */
+    public PagedList<SensitivityLabelInner> listByDatabaseNext(final String nextPageLink) {
+        ServiceResponse<Page<SensitivityLabelInner>> response = listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SensitivityLabelInner>(response.body()) {
+            @Override
+            public Page<SensitivityLabelInner> nextPage(String nextPageLink) {
+                return listByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<SensitivityLabelInner>> listByDatabaseNextAsync(final String nextPageLink, final ServiceFuture<List<SensitivityLabelInner>> serviceFuture, final ListOperationCallback<SensitivityLabelInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByDatabaseNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(String nextPageLink) {
+                    return listByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<Page<SensitivityLabelInner>> listByDatabaseNextAsync(final String nextPageLink) {
+        return listByDatabaseNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Page<SensitivityLabelInner>>() {
+                @Override
+                public Page<SensitivityLabelInner> call(ServiceResponse<Page<SensitivityLabelInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listByDatabaseNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByDatabaseNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(ServiceResponse<Page<SensitivityLabelInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listByDatabaseNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByDatabaseNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SensitivityLabelInner>> result = listByDatabaseNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SensitivityLabelInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SensitivityLabelInner>> listByDatabaseNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SensitivityLabelInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SensitivityLabelInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl.java
new file mode 100644
index 000000000000..dc0a4fa31aff
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl.java
@@ -0,0 +1,112 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+
+class RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl extends CreatableUpdatableImpl<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy, ManagedBackupShortTermRetentionPolicyInner, RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl> implements RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy, RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.Definition, RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy.Update {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String restorableDroppedDatabaseId;
+    private Integer cretentionDays;
+    private Integer uretentionDays;
+
+    RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(String name, SqlManager manager) {
+        super(name, new ManagedBackupShortTermRetentionPolicyInner());
+        this.manager = manager;
+        // Set resource name
+        this.restorableDroppedDatabaseId = name;
+        //
+    }
+
+    RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl(ManagedBackupShortTermRetentionPolicyInner inner, SqlManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.restorableDroppedDatabaseId = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.restorableDroppedDatabaseId = IdParsingUtils.getValueFromIdByName(inner.id(), "restorableDroppedDatabases");
+        //
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> createResourceAsync() {
+        ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner client = this.manager().inner().managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.restorableDroppedDatabaseId, this.cretentionDays)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicy> updateResourceAsync() {
+        ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner client = this.manager().inner().managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies();
+        return client.updateAsync(this.resourceGroupName, this.managedInstanceName, this.restorableDroppedDatabaseId, this.uretentionDays)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ManagedBackupShortTermRetentionPolicyInner> getInnerAsync() {
+        ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner client = this.manager().inner().managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.restorableDroppedDatabaseId);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer retentionDays() {
+        return this.inner().retentionDays();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl withExistingRestorableDroppedDatabasis(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        this.resourceGroupName = resourceGroupName;
+        this.managedInstanceName = managedInstanceName;
+        this.restorableDroppedDatabaseId = restorableDroppedDatabaseId;
+        return this;
+    }
+
+    @Override
+    public RestorableDroppedDatabasisManagedInstanceManagedBackupShortTermRetentionPolicyImpl withRetentionDays(Integer retentionDays) {
+        if (isInCreateMode()) {
+            this.cretentionDays = retentionDays;
+        } else {
+            this.uretentionDays = retentionDays;
+        }
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabaseImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabaseImpl.java
new file mode 100644
index 000000000000..5b85693595a6
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabaseImpl.java
@@ -0,0 +1,90 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabase;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import org.joda.time.DateTime;
+import java.util.Map;
+
+class RestorableDroppedManagedDatabaseImpl extends IndexableRefreshableWrapperImpl<RestorableDroppedManagedDatabase, RestorableDroppedManagedDatabaseInner> implements RestorableDroppedManagedDatabase {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String restorableDroppedDatabaseId;
+
+    RestorableDroppedManagedDatabaseImpl(RestorableDroppedManagedDatabaseInner inner,  SqlManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.restorableDroppedDatabaseId = IdParsingUtils.getValueFromIdByName(inner.id(), "restorableDroppedDatabases");
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<RestorableDroppedManagedDatabaseInner> getInnerAsync() {
+        RestorableDroppedManagedDatabasesInner client = this.manager().inner().restorableDroppedManagedDatabases();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.restorableDroppedDatabaseId);
+    }
+
+
+
+    @Override
+    public DateTime creationDate() {
+        return this.inner().creationDate();
+    }
+
+    @Override
+    public String databaseName() {
+        return this.inner().databaseName();
+    }
+
+    @Override
+    public DateTime deletionDate() {
+        return this.inner().deletionDate();
+    }
+
+    @Override
+    public DateTime earliestRestoreDate() {
+        return this.inner().earliestRestoreDate();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabaseInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabaseInner.java
new file mode 100644
index 000000000000..0ab7503467f7
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabaseInner.java
@@ -0,0 +1,81 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * A restorable dropped managed database resource.
+ */
+@JsonFlatten
+public class RestorableDroppedManagedDatabaseInner extends Resource {
+    /**
+     * The name of the database.
+     */
+    @JsonProperty(value = "properties.databaseName", access = JsonProperty.Access.WRITE_ONLY)
+    private String databaseName;
+
+    /**
+     * The creation date of the database (ISO8601 format).
+     */
+    @JsonProperty(value = "properties.creationDate", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime creationDate;
+
+    /**
+     * The deletion date of the database (ISO8601 format).
+     */
+    @JsonProperty(value = "properties.deletionDate", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime deletionDate;
+
+    /**
+     * The earliest restore date of the database (ISO8601 format).
+     */
+    @JsonProperty(value = "properties.earliestRestoreDate", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime earliestRestoreDate;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Get the creation date of the database (ISO8601 format).
+     *
+     * @return the creationDate value
+     */
+    public DateTime creationDate() {
+        return this.creationDate;
+    }
+
+    /**
+     * Get the deletion date of the database (ISO8601 format).
+     *
+     * @return the deletionDate value
+     */
+    public DateTime deletionDate() {
+        return this.deletionDate;
+    }
+
+    /**
+     * Get the earliest restore date of the database (ISO8601 format).
+     *
+     * @return the earliestRestoreDate value
+     */
+    public DateTime earliestRestoreDate() {
+        return this.earliestRestoreDate;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabasesImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabasesImpl.java
new file mode 100644
index 000000000000..d46ff7922490
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabasesImpl.java
@@ -0,0 +1,73 @@
+/**
+ * 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.
+ * abc
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabases;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabase;
+import com.microsoft.azure.Page;
+
+class RestorableDroppedManagedDatabasesImpl extends WrapperImpl<RestorableDroppedManagedDatabasesInner> implements RestorableDroppedManagedDatabases {
+    private final SqlManager manager;
+
+    RestorableDroppedManagedDatabasesImpl(SqlManager manager) {
+        super(manager.inner().restorableDroppedManagedDatabases());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    private RestorableDroppedManagedDatabaseImpl wrapRestorableDroppedManagedDatabaseModel(RestorableDroppedManagedDatabaseInner inner) {
+        return  new RestorableDroppedManagedDatabaseImpl(inner, manager());
+    }
+
+    private Observable<RestorableDroppedManagedDatabaseInner> getRestorableDroppedManagedDatabaseInnerUsingRestorableDroppedManagedDatabasesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String managedInstanceName = IdParsingUtils.getValueFromIdByName(id, "managedInstances");
+        String restorableDroppedDatabaseId = IdParsingUtils.getValueFromIdByName(id, "restorableDroppedDatabases");
+        RestorableDroppedManagedDatabasesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId);
+    }
+
+    @Override
+    public Observable<RestorableDroppedManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        RestorableDroppedManagedDatabasesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId)
+        .map(new Func1<RestorableDroppedManagedDatabaseInner, RestorableDroppedManagedDatabase>() {
+            @Override
+            public RestorableDroppedManagedDatabase call(RestorableDroppedManagedDatabaseInner inner) {
+                return wrapRestorableDroppedManagedDatabaseModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<RestorableDroppedManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        RestorableDroppedManagedDatabasesInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<RestorableDroppedManagedDatabaseInner>, Iterable<RestorableDroppedManagedDatabaseInner>>() {
+            @Override
+            public Iterable<RestorableDroppedManagedDatabaseInner> call(Page<RestorableDroppedManagedDatabaseInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RestorableDroppedManagedDatabaseInner, RestorableDroppedManagedDatabase>() {
+            @Override
+            public RestorableDroppedManagedDatabase call(RestorableDroppedManagedDatabaseInner inner) {
+                return wrapRestorableDroppedManagedDatabaseModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabasesInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabasesInner.java
new file mode 100644
index 000000000000..3ec919754da3
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/RestorableDroppedManagedDatabasesInner.java
@@ -0,0 +1,401 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in RestorableDroppedManagedDatabases.
+ */
+public class RestorableDroppedManagedDatabasesInner {
+    /** The Retrofit service to perform REST calls. */
+    private RestorableDroppedManagedDatabasesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RestorableDroppedManagedDatabasesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RestorableDroppedManagedDatabasesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(RestorableDroppedManagedDatabasesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RestorableDroppedManagedDatabases to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RestorableDroppedManagedDatabasesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabases listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabases get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("restorableDroppedDatabaseId") String restorableDroppedDatabaseId, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabases listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RestorableDroppedManagedDatabaseInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<RestorableDroppedManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RestorableDroppedManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<RestorableDroppedManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<RestorableDroppedManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RestorableDroppedManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>, Page<RestorableDroppedManagedDatabaseInner>>() {
+                @Override
+                public Page<RestorableDroppedManagedDatabaseInner> call(ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>, Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> call(ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+    ServiceResponse<PageImpl<RestorableDroppedManagedDatabaseInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<RestorableDroppedManagedDatabaseInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RestorableDroppedManagedDatabaseInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RestorableDroppedManagedDatabaseInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RestorableDroppedManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RestorableDroppedManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a restorable dropped managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RestorableDroppedManagedDatabaseInner object if successful.
+     */
+    public RestorableDroppedManagedDatabaseInner get(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a restorable dropped managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<RestorableDroppedManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId, final ServiceCallback<RestorableDroppedManagedDatabaseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId), serviceCallback);
+    }
+
+    /**
+     * Gets a restorable dropped managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RestorableDroppedManagedDatabaseInner object
+     */
+    public Observable<RestorableDroppedManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId).map(new Func1<ServiceResponse<RestorableDroppedManagedDatabaseInner>, RestorableDroppedManagedDatabaseInner>() {
+            @Override
+            public RestorableDroppedManagedDatabaseInner call(ServiceResponse<RestorableDroppedManagedDatabaseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a restorable dropped managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param restorableDroppedDatabaseId the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RestorableDroppedManagedDatabaseInner object
+     */
+    public Observable<ServiceResponse<RestorableDroppedManagedDatabaseInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String restorableDroppedDatabaseId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (restorableDroppedDatabaseId == null) {
+            throw new IllegalArgumentException("Parameter restorableDroppedDatabaseId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(resourceGroupName, managedInstanceName, restorableDroppedDatabaseId, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RestorableDroppedManagedDatabaseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RestorableDroppedManagedDatabaseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RestorableDroppedManagedDatabaseInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RestorableDroppedManagedDatabaseInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RestorableDroppedManagedDatabaseInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RestorableDroppedManagedDatabaseInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RestorableDroppedManagedDatabaseInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RestorableDroppedManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RestorableDroppedManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<RestorableDroppedManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<RestorableDroppedManagedDatabaseInner>> serviceFuture, final ListOperationCallback<RestorableDroppedManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RestorableDroppedManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>, Page<RestorableDroppedManagedDatabaseInner>>() {
+                @Override
+                public Page<RestorableDroppedManagedDatabaseInner> call(ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>, Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> call(ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of restorable dropped managed databases.
+     *
+    ServiceResponse<PageImpl<RestorableDroppedManagedDatabaseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RestorableDroppedManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> listByInstanceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RestorableDroppedManagedDatabaseInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RestorableDroppedManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RestorableDroppedManagedDatabaseInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RestorableDroppedManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RestorableDroppedManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelImpl.java
new file mode 100644
index 000000000000..582530d11cc0
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelImpl.java
@@ -0,0 +1,153 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabel;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+
+class SensitivityLabelImpl extends CreatableUpdatableImpl<SensitivityLabel, SensitivityLabelInner, SensitivityLabelImpl> implements SensitivityLabel, SensitivityLabel.Definition, SensitivityLabel.Update {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String serverName;
+    private String databaseName;
+    private String schemaName;
+    private String tableName;
+    private String columnName;
+
+    SensitivityLabelImpl(String name, SqlManager manager) {
+        super(name, new SensitivityLabelInner());
+        this.manager = manager;
+        // Set resource name
+        this.columnName = name;
+        //
+    }
+
+    SensitivityLabelImpl(SensitivityLabelInner inner, SqlManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.columnName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.serverName = IdParsingUtils.getValueFromIdByName(inner.id(), "servers");
+        this.databaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "databases");
+        this.schemaName = IdParsingUtils.getValueFromIdByName(inner.id(), "schemas");
+        this.tableName = IdParsingUtils.getValueFromIdByName(inner.id(), "tables");
+        this.columnName = IdParsingUtils.getValueFromIdByName(inner.id(), "columns");
+        //
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<SensitivityLabel> createResourceAsync() {
+        SensitivityLabelsInner client = this.manager().inner().sensitivityLabels();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.serverName, this.databaseName, this.schemaName, this.tableName, this.columnName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<SensitivityLabel> updateResourceAsync() {
+        SensitivityLabelsInner client = this.manager().inner().sensitivityLabels();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.serverName, this.databaseName, this.schemaName, this.tableName, this.columnName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<SensitivityLabelInner> getInnerAsync() {
+        SensitivityLabelsInner client = this.manager().inner().sensitivityLabels();
+        return client.getAsync(this.resourceGroupName, this.serverName, this.databaseName, this.schemaName, this.tableName, this.columnName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String informationType() {
+        return this.inner().informationType();
+    }
+
+    @Override
+    public String informationTypeId() {
+        return this.inner().informationTypeId();
+    }
+
+    @Override
+    public Boolean isDisabled() {
+        return this.inner().isDisabled();
+    }
+
+    @Override
+    public String labelId() {
+        return this.inner().labelId();
+    }
+
+    @Override
+    public String labelName() {
+        return this.inner().labelName();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public SensitivityLabelImpl withExistingColumn(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        this.resourceGroupName = resourceGroupName;
+        this.serverName = serverName;
+        this.databaseName = databaseName;
+        this.schemaName = schemaName;
+        this.tableName = tableName;
+        this.columnName = columnName;
+        return this;
+    }
+
+    @Override
+    public SensitivityLabelImpl withInformationType(String informationType) {
+        this.inner().withInformationType(informationType);
+        return this;
+    }
+
+    @Override
+    public SensitivityLabelImpl withInformationTypeId(String informationTypeId) {
+        this.inner().withInformationTypeId(informationTypeId);
+        return this;
+    }
+
+    @Override
+    public SensitivityLabelImpl withLabelId(String labelId) {
+        this.inner().withLabelId(labelId);
+        return this;
+    }
+
+    @Override
+    public SensitivityLabelImpl withLabelName(String labelName) {
+        this.inner().withLabelName(labelName);
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelInner.java
new file mode 100644
index 000000000000..521015f7fb24
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelInner.java
@@ -0,0 +1,141 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A sensitivity label.
+ */
+@JsonFlatten
+public class SensitivityLabelInner extends ProxyResource {
+    /**
+     * The label name.
+     */
+    @JsonProperty(value = "properties.labelName")
+    private String labelName;
+
+    /**
+     * The label ID.
+     */
+    @JsonProperty(value = "properties.labelId")
+    private String labelId;
+
+    /**
+     * The information type.
+     */
+    @JsonProperty(value = "properties.informationType")
+    private String informationType;
+
+    /**
+     * The information type ID.
+     */
+    @JsonProperty(value = "properties.informationTypeId")
+    private String informationTypeId;
+
+    /**
+     * Is sensitivity recommendation disabled. Applicable for recommended
+     * sensitivity label only. Specifies whether the sensitivity recommendation
+     * on this column is disabled (dismissed) or not.
+     */
+    @JsonProperty(value = "properties.isDisabled", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean isDisabled;
+
+    /**
+     * Get the label name.
+     *
+     * @return the labelName value
+     */
+    public String labelName() {
+        return this.labelName;
+    }
+
+    /**
+     * Set the label name.
+     *
+     * @param labelName the labelName value to set
+     * @return the SensitivityLabelInner object itself.
+     */
+    public SensitivityLabelInner withLabelName(String labelName) {
+        this.labelName = labelName;
+        return this;
+    }
+
+    /**
+     * Get the label ID.
+     *
+     * @return the labelId value
+     */
+    public String labelId() {
+        return this.labelId;
+    }
+
+    /**
+     * Set the label ID.
+     *
+     * @param labelId the labelId value to set
+     * @return the SensitivityLabelInner object itself.
+     */
+    public SensitivityLabelInner withLabelId(String labelId) {
+        this.labelId = labelId;
+        return this;
+    }
+
+    /**
+     * Get the information type.
+     *
+     * @return the informationType value
+     */
+    public String informationType() {
+        return this.informationType;
+    }
+
+    /**
+     * Set the information type.
+     *
+     * @param informationType the informationType value to set
+     * @return the SensitivityLabelInner object itself.
+     */
+    public SensitivityLabelInner withInformationType(String informationType) {
+        this.informationType = informationType;
+        return this;
+    }
+
+    /**
+     * Get the information type ID.
+     *
+     * @return the informationTypeId value
+     */
+    public String informationTypeId() {
+        return this.informationTypeId;
+    }
+
+    /**
+     * Set the information type ID.
+     *
+     * @param informationTypeId the informationTypeId value to set
+     * @return the SensitivityLabelInner object itself.
+     */
+    public SensitivityLabelInner withInformationTypeId(String informationTypeId) {
+        this.informationTypeId = informationTypeId;
+        return this;
+    }
+
+    /**
+     * Get is sensitivity recommendation disabled. Applicable for recommended sensitivity label only. Specifies whether the sensitivity recommendation on this column is disabled (dismissed) or not.
+     *
+     * @return the isDisabled value
+     */
+    public Boolean isDisabled() {
+        return this.isDisabled;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelsImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelsImpl.java
new file mode 100644
index 000000000000..ccc8de3f6f69
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelsImpl.java
@@ -0,0 +1,98 @@
+/**
+ * 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.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabel;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.DatabasisServerSensitivityLabel;
+
+class SensitivityLabelsImpl extends WrapperImpl<SensitivityLabelsInner> implements SensitivityLabels {
+    private final SqlManager manager;
+
+    SensitivityLabelsImpl(SqlManager manager) {
+        super(manager.inner().sensitivityLabels());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public SensitivityLabelImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private SensitivityLabelImpl wrapModel(SensitivityLabelInner inner) {
+        return  new SensitivityLabelImpl(inner, manager());
+    }
+
+    private SensitivityLabelImpl wrapModel(String name) {
+        return new SensitivityLabelImpl(name, this.manager());
+    }
+
+    @Override
+    public Completable enableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        SensitivityLabelsInner client = this.inner();
+        return client.enableRecommendationAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).toCompletable();
+    }
+
+    @Override
+    public Completable disableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        SensitivityLabelsInner client = this.inner();
+        return client.disableRecommendationAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).toCompletable();
+    }
+
+    @Override
+    public Observable<SensitivityLabel> getAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelSource sensitivityLabelSource) {
+        SensitivityLabelsInner client = this.inner();
+        return client.getAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource)
+        .map(new Func1<SensitivityLabelInner, SensitivityLabel>() {
+            @Override
+            public SensitivityLabel call(SensitivityLabelInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        SensitivityLabelsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).toCompletable();
+    }
+
+    private DatabasisServerSensitivityLabelImpl wrapDatabasisServerSensitivityLabelModel(SensitivityLabelInner inner) {
+        return  new DatabasisServerSensitivityLabelImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<DatabasisServerSensitivityLabel> listCurrentByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        SensitivityLabelsInner client = this.inner();
+        return client.listCurrentByDatabaseAsync(resourceGroupName, serverName, databaseName)
+        .flatMapIterable(new Func1<Page<SensitivityLabelInner>, Iterable<SensitivityLabelInner>>() {
+            @Override
+            public Iterable<SensitivityLabelInner> call(Page<SensitivityLabelInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SensitivityLabelInner, DatabasisServerSensitivityLabel>() {
+            @Override
+            public DatabasisServerSensitivityLabel call(SensitivityLabelInner inner) {
+                return wrapDatabasisServerSensitivityLabelModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelsInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelsInner.java
new file mode 100644
index 000000000000..e3b212635a16
--- /dev/null
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SensitivityLabelsInner.java
@@ -0,0 +1,1055 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.sql.v2017_03_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabelSource;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in SensitivityLabels.
+ */
+public class SensitivityLabelsInner {
+    /** The Retrofit service to perform REST calls. */
+    private SensitivityLabelsService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of SensitivityLabelsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public SensitivityLabelsInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(SensitivityLabelsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for SensitivityLabels to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface SensitivityLabelsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels listCurrentByDatabase" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/currentSensitivityLabels")
+        Observable<Response<ResponseBody>> listCurrentByDatabase(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels enableRecommendation" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/columns/{columnName}/sensitivityLabels/{sensitivityLabelSource}/enable")
+        Observable<Response<ResponseBody>> enableRecommendation(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Path("columnName") String columnName, @Path("sensitivityLabelSource") String sensitivityLabelSource, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels disableRecommendation" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/columns/{columnName}/sensitivityLabels/{sensitivityLabelSource}/disable")
+        Observable<Response<ResponseBody>> disableRecommendation(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Path("columnName") String columnName, @Path("sensitivityLabelSource") String sensitivityLabelSource, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/columns/{columnName}/sensitivityLabels/{sensitivityLabelSource}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Path("columnName") String columnName, @Path("sensitivityLabelSource") SensitivityLabelSource sensitivityLabelSource, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/columns/{columnName}/sensitivityLabels/{sensitivityLabelSource}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Path("columnName") String columnName, @Path("sensitivityLabelSource") String sensitivityLabelSource, @Path("subscriptionId") String subscriptionId, @Body SensitivityLabelInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/columns/{columnName}/sensitivityLabels/{sensitivityLabelSource}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Path("columnName") String columnName, @Path("sensitivityLabelSource") String sensitivityLabelSource, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels listCurrentByDatabaseNext" })
+        @GET
+        Observable<Response<ResponseBody>> listCurrentByDatabaseNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object if successful.
+     */
+    public PagedList<SensitivityLabelInner> listCurrentByDatabase(final String resourceGroupName, final String serverName, final String databaseName) {
+        ServiceResponse<Page<SensitivityLabelInner>> response = listCurrentByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName).toBlocking().single();
+        return new PagedList<SensitivityLabelInner>(response.body()) {
+            @Override
+            public Page<SensitivityLabelInner> nextPage(String nextPageLink) {
+                return listCurrentByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<SensitivityLabelInner>> listCurrentByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName, final ListOperationCallback<SensitivityLabelInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listCurrentByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName),
+            new Func1<String, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(String nextPageLink) {
+                    return listCurrentByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<Page<SensitivityLabelInner>> listCurrentByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        return listCurrentByDatabaseWithServiceResponseAsync(resourceGroupName, serverName, databaseName)
+            .map(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Page<SensitivityLabelInner>>() {
+                @Override
+                public Page<SensitivityLabelInner> call(ServiceResponse<Page<SensitivityLabelInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listCurrentByDatabaseWithServiceResponseAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        return listCurrentByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName)
+            .concatMap(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(ServiceResponse<Page<SensitivityLabelInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listCurrentByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listCurrentByDatabaseSinglePageAsync(final String resourceGroupName, final String serverName, final String databaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        return service.listCurrentByDatabase(resourceGroupName, serverName, databaseName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SensitivityLabelInner>> result = listCurrentByDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SensitivityLabelInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object if successful.
+     */
+    public PagedList<SensitivityLabelInner> listCurrentByDatabase(final String resourceGroupName, final String serverName, final String databaseName, final String filter) {
+        ServiceResponse<Page<SensitivityLabelInner>> response = listCurrentByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName, filter).toBlocking().single();
+        return new PagedList<SensitivityLabelInner>(response.body()) {
+            @Override
+            public Page<SensitivityLabelInner> nextPage(String nextPageLink) {
+                return listCurrentByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<SensitivityLabelInner>> listCurrentByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName, final String filter, final ListOperationCallback<SensitivityLabelInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listCurrentByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName, filter),
+            new Func1<String, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(String nextPageLink) {
+                    return listCurrentByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<Page<SensitivityLabelInner>> listCurrentByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName, final String filter) {
+        return listCurrentByDatabaseWithServiceResponseAsync(resourceGroupName, serverName, databaseName, filter)
+            .map(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Page<SensitivityLabelInner>>() {
+                @Override
+                public Page<SensitivityLabelInner> call(ServiceResponse<Page<SensitivityLabelInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listCurrentByDatabaseWithServiceResponseAsync(final String resourceGroupName, final String serverName, final String databaseName, final String filter) {
+        return listCurrentByDatabaseSinglePageAsync(resourceGroupName, serverName, databaseName, filter)
+            .concatMap(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(ServiceResponse<Page<SensitivityLabelInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listCurrentByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param serverName The name of the server.
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param databaseName The name of the database.
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listCurrentByDatabaseSinglePageAsync(final String resourceGroupName, final String serverName, final String databaseName, final String filter) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listCurrentByDatabase(resourceGroupName, serverName, databaseName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SensitivityLabelInner>> result = listCurrentByDatabaseDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SensitivityLabelInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SensitivityLabelInner>> listCurrentByDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SensitivityLabelInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SensitivityLabelInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Enables sensitivity recommendations on a given column (recommendations are enabled by default on all columns).
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void enableRecommendation(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        enableRecommendationWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).toBlocking().single().body();
+    }
+
+    /**
+     * Enables sensitivity recommendations on a given column (recommendations are enabled by default on all columns).
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> enableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(enableRecommendationWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName), serviceCallback);
+    }
+
+    /**
+     * Enables sensitivity recommendations on a given column (recommendations are enabled by default on all columns).
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> enableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        return enableRecommendationWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Enables sensitivity recommendations on a given column (recommendations are enabled by default on all columns).
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> enableRecommendationWithServiceResponseAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (columnName == null) {
+            throw new IllegalArgumentException("Parameter columnName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String sensitivityLabelSource = "recommended";
+        return service.enableRecommendation(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = enableRecommendationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> enableRecommendationDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Disables sensitivity recommendations on a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void disableRecommendation(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        disableRecommendationWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).toBlocking().single().body();
+    }
+
+    /**
+     * Disables sensitivity recommendations on a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> disableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(disableRecommendationWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName), serviceCallback);
+    }
+
+    /**
+     * Disables sensitivity recommendations on a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> disableRecommendationAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        return disableRecommendationWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disables sensitivity recommendations on a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> disableRecommendationWithServiceResponseAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (columnName == null) {
+            throw new IllegalArgumentException("Parameter columnName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String sensitivityLabelSource = "recommended";
+        return service.disableRecommendation(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = disableRecommendationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> disableRecommendationDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param sensitivityLabelSource The source of the sensitivity label. Possible values include: 'current', 'recommended'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SensitivityLabelInner object if successful.
+     */
+    public SensitivityLabelInner get(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelSource sensitivityLabelSource) {
+        return getWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param sensitivityLabelSource The source of the sensitivity label. Possible values include: 'current', 'recommended'
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<SensitivityLabelInner> getAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelSource sensitivityLabelSource, final ServiceCallback<SensitivityLabelInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource), serviceCallback);
+    }
+
+    /**
+     * Gets the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param sensitivityLabelSource The source of the sensitivity label. Possible values include: 'current', 'recommended'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SensitivityLabelInner object
+     */
+    public Observable<SensitivityLabelInner> getAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelSource sensitivityLabelSource) {
+        return getWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource).map(new Func1<ServiceResponse<SensitivityLabelInner>, SensitivityLabelInner>() {
+            @Override
+            public SensitivityLabelInner call(ServiceResponse<SensitivityLabelInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param sensitivityLabelSource The source of the sensitivity label. Possible values include: 'current', 'recommended'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SensitivityLabelInner object
+     */
+    public Observable<ServiceResponse<SensitivityLabelInner>> getWithServiceResponseAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelSource sensitivityLabelSource) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (columnName == null) {
+            throw new IllegalArgumentException("Parameter columnName is required and cannot be null.");
+        }
+        if (sensitivityLabelSource == null) {
+            throw new IllegalArgumentException("Parameter sensitivityLabelSource is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SensitivityLabelInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SensitivityLabelInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SensitivityLabelInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SensitivityLabelInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SensitivityLabelInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SensitivityLabelInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param parameters The column sensitivity label resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SensitivityLabelInner object if successful.
+     */
+    public SensitivityLabelInner createOrUpdate(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param parameters The column sensitivity label resource.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<SensitivityLabelInner> createOrUpdateAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelInner parameters, final ServiceCallback<SensitivityLabelInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param parameters The column sensitivity label resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SensitivityLabelInner object
+     */
+    public Observable<SensitivityLabelInner> createOrUpdateAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, parameters).map(new Func1<ServiceResponse<SensitivityLabelInner>, SensitivityLabelInner>() {
+            @Override
+            public SensitivityLabelInner call(ServiceResponse<SensitivityLabelInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param parameters The column sensitivity label resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SensitivityLabelInner object
+     */
+    public Observable<ServiceResponse<SensitivityLabelInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, SensitivityLabelInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (columnName == null) {
+            throw new IllegalArgumentException("Parameter columnName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String sensitivityLabelSource = "current";
+        return service.createOrUpdate(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SensitivityLabelInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SensitivityLabelInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SensitivityLabelInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SensitivityLabelInner> createOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SensitivityLabelInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SensitivityLabelInner>() { }.getType())
+                .register(201, new TypeToken<SensitivityLabelInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        deleteWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> deleteAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName), serviceCallback);
+    }
+
+    /**
+     * Deletes the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the sensitivity label of a given column.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @param schemaName The name of the schema.
+     * @param tableName The name of the table.
+     * @param columnName The name of the column.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String serverName, String databaseName, String schemaName, String tableName, String columnName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (columnName == null) {
+            throw new IllegalArgumentException("Parameter columnName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String sensitivityLabelSource = "current";
+        return service.delete(resourceGroupName, serverName, databaseName, schemaName, tableName, columnName, sensitivityLabelSource, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object if successful.
+     */
+    public PagedList<SensitivityLabelInner> listCurrentByDatabaseNext(final String nextPageLink) {
+        ServiceResponse<Page<SensitivityLabelInner>> response = listCurrentByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SensitivityLabelInner>(response.body()) {
+            @Override
+            public Page<SensitivityLabelInner> nextPage(String nextPageLink) {
+                return listCurrentByDatabaseNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<SensitivityLabelInner>> listCurrentByDatabaseNextAsync(final String nextPageLink, final ServiceFuture<List<SensitivityLabelInner>> serviceFuture, final ListOperationCallback<SensitivityLabelInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listCurrentByDatabaseNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(String nextPageLink) {
+                    return listCurrentByDatabaseNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<Page<SensitivityLabelInner>> listCurrentByDatabaseNextAsync(final String nextPageLink) {
+        return listCurrentByDatabaseNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Page<SensitivityLabelInner>>() {
+                @Override
+                public Page<SensitivityLabelInner> call(ServiceResponse<Page<SensitivityLabelInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SensitivityLabelInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listCurrentByDatabaseNextWithServiceResponseAsync(final String nextPageLink) {
+        return listCurrentByDatabaseNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SensitivityLabelInner>>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(ServiceResponse<Page<SensitivityLabelInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listCurrentByDatabaseNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the sensitivity labels of a given database.
+     *
+    ServiceResponse<PageImpl<SensitivityLabelInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SensitivityLabelInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SensitivityLabelInner>>> listCurrentByDatabaseNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listCurrentByDatabaseNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SensitivityLabelInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SensitivityLabelInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SensitivityLabelInner>> result = listCurrentByDatabaseNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SensitivityLabelInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SensitivityLabelInner>> listCurrentByDatabaseNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SensitivityLabelInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SensitivityLabelInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerBlobAuditingPolicyInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerBlobAuditingPolicyInner.java
index f8e45d42ec64..d2e3e69e66c4 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerBlobAuditingPolicyInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerBlobAuditingPolicyInner.java
@@ -142,8 +142,8 @@ public class ServerBlobAuditingPolicyInner extends ProxyResource {
 
     /**
      * Specifies whether audit events are sent to Azure Monitor.
-     * In order to send the events to Azure Monitor, specify 'State' as
-     * 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     * In order to send the events to Azure Monitor, specify 'state' as
+     * 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      *
      * When using REST API to configure auditing, Diagnostic Settings with
      * 'SQLSecurityAuditEvents' diagnostic logs category on the database should
@@ -393,7 +393,7 @@ public ServerBlobAuditingPolicyInner withIsStorageSecondaryKeyInUse(Boolean isSt
 
     /**
      * Get specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
@@ -409,7 +409,7 @@ public Boolean isAzureMonitorTargetEnabled() {
 
     /**
      * Set specifies whether audit events are sent to Azure Monitor.
-     In order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.
+     In order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.
      When using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.
      Note that for server level audit you should use the 'master' database as {databaseName}.
      Diagnostic Settings URI format:
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java
index c6ade364ecd0..59d243f70704 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java
@@ -13,6 +13,7 @@
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ServerSecurityAlertPolicies;
 import rx.Observable;
 import rx.functions.Func1;
+import com.microsoft.azure.Page;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ServerSecurityAlertPolicy;
 
 class ServerSecurityAlertPoliciesImpl extends WrapperImpl<ServerSecurityAlertPoliciesInner> implements ServerSecurityAlertPolicies {
@@ -40,6 +41,24 @@ private ServerSecurityAlertPolicyImpl wrapModel(String name) {
         return new ServerSecurityAlertPolicyImpl(name, this.manager());
     }
 
+    @Override
+    public Observable<ServerSecurityAlertPolicy> listByServerAsync(final String resourceGroupName, final String serverName) {
+        ServerSecurityAlertPoliciesInner client = this.inner();
+        return client.listByServerAsync(resourceGroupName, serverName)
+        .flatMapIterable(new Func1<Page<ServerSecurityAlertPolicyInner>, Iterable<ServerSecurityAlertPolicyInner>>() {
+            @Override
+            public Iterable<ServerSecurityAlertPolicyInner> call(Page<ServerSecurityAlertPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ServerSecurityAlertPolicyInner, ServerSecurityAlertPolicy>() {
+            @Override
+            public ServerSecurityAlertPolicy call(ServerSecurityAlertPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
     @Override
     public Observable<ServerSecurityAlertPolicy> getAsync(String resourceGroupName, String serverName) {
         ServerSecurityAlertPoliciesInner client = this.inner();
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesInner.java
index def77e2a49bb..99f15e68d758 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPoliciesInner.java
@@ -10,12 +10,17 @@
 
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
 import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
 import com.microsoft.rest.ServiceCallback;
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponse;
 import com.microsoft.rest.Validator;
 import java.io.IOException;
+import java.util.List;
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -24,6 +29,7 @@
 import retrofit2.http.Path;
 import retrofit2.http.PUT;
 import retrofit2.http.Query;
+import retrofit2.http.Url;
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
@@ -66,6 +72,14 @@ interface ServerSecurityAlertPoliciesService {
         @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}")
         Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("securityAlertPolicyName") String securityAlertPolicyName, @Path("subscriptionId") String subscriptionId, @Body ServerSecurityAlertPolicyInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ServerSecurityAlertPolicies listByServer" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/securityAlertPolicies")
+        Observable<Response<ResponseBody>> listByServer(@Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_03_01_preview.ServerSecurityAlertPolicies listByServerNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByServerNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
     }
 
     /**
@@ -329,4 +343,238 @@ private ServiceResponse<ServerSecurityAlertPolicyInner> beginCreateOrUpdateDeleg
                 .build(response);
     }
 
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object if successful.
+     */
+    public PagedList<ServerSecurityAlertPolicyInner> listByServer(final String resourceGroupName, final String serverName) {
+        ServiceResponse<Page<ServerSecurityAlertPolicyInner>> response = listByServerSinglePageAsync(resourceGroupName, serverName).toBlocking().single();
+        return new PagedList<ServerSecurityAlertPolicyInner>(response.body()) {
+            @Override
+            public Page<ServerSecurityAlertPolicyInner> nextPage(String nextPageLink) {
+                return listByServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ServerSecurityAlertPolicyInner>> listByServerAsync(final String resourceGroupName, final String serverName, final ListOperationCallback<ServerSecurityAlertPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByServerSinglePageAsync(resourceGroupName, serverName),
+            new Func1<String, Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> call(String nextPageLink) {
+                    return listByServerNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<Page<ServerSecurityAlertPolicyInner>> listByServerAsync(final String resourceGroupName, final String serverName) {
+        return listByServerWithServiceResponseAsync(resourceGroupName, serverName)
+            .map(new Func1<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>, Page<ServerSecurityAlertPolicyInner>>() {
+                @Override
+                public Page<ServerSecurityAlertPolicyInner> call(ServiceResponse<Page<ServerSecurityAlertPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> listByServerWithServiceResponseAsync(final String resourceGroupName, final String serverName) {
+        return listByServerSinglePageAsync(resourceGroupName, serverName)
+            .concatMap(new Func1<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>, Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> call(ServiceResponse<Page<ServerSecurityAlertPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByServerNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+    ServiceResponse<PageImpl<ServerSecurityAlertPolicyInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<ServerSecurityAlertPolicyInner>> * @param serverName The name of the server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> listByServerSinglePageAsync(final String resourceGroupName, final String serverName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serverName == null) {
+            throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listByServer(resourceGroupName, serverName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServerSecurityAlertPolicyInner>> result = listByServerDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServerSecurityAlertPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServerSecurityAlertPolicyInner>> listByServerDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServerSecurityAlertPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServerSecurityAlertPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object if successful.
+     */
+    public PagedList<ServerSecurityAlertPolicyInner> listByServerNext(final String nextPageLink) {
+        ServiceResponse<Page<ServerSecurityAlertPolicyInner>> response = listByServerNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ServerSecurityAlertPolicyInner>(response.body()) {
+            @Override
+            public Page<ServerSecurityAlertPolicyInner> nextPage(String nextPageLink) {
+                return listByServerNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ServerSecurityAlertPolicyInner>> listByServerNextAsync(final String nextPageLink, final ServiceFuture<List<ServerSecurityAlertPolicyInner>> serviceFuture, final ListOperationCallback<ServerSecurityAlertPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByServerNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> call(String nextPageLink) {
+                    return listByServerNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<Page<ServerSecurityAlertPolicyInner>> listByServerNextAsync(final String nextPageLink) {
+        return listByServerNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>, Page<ServerSecurityAlertPolicyInner>>() {
+                @Override
+                public Page<ServerSecurityAlertPolicyInner> call(ServiceResponse<Page<ServerSecurityAlertPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> listByServerNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByServerNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>, Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> call(ServiceResponse<Page<ServerSecurityAlertPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByServerNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get the server's threat detection policies.
+     *
+    ServiceResponse<PageImpl<ServerSecurityAlertPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServerSecurityAlertPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> listByServerNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByServerNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServerSecurityAlertPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServerSecurityAlertPolicyInner>> result = listByServerNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServerSecurityAlertPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServerSecurityAlertPolicyInner>> listByServerNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServerSecurityAlertPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServerSecurityAlertPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
 }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyImpl.java
index 483198adba66..0a158d1c8663 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyImpl.java
@@ -13,6 +13,7 @@
 import rx.Observable;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.SecurityAlertPolicyState;
 import java.util.List;
+import org.joda.time.DateTime;
 
 class ServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ServerSecurityAlertPolicy, ServerSecurityAlertPolicyInner, ServerSecurityAlertPolicyImpl> implements ServerSecurityAlertPolicy, ServerSecurityAlertPolicy.Definition, ServerSecurityAlertPolicy.Update {
     private final SqlManager manager;
@@ -69,6 +70,11 @@ public boolean isInCreateMode() {
     }
 
 
+    @Override
+    public DateTime creationTime() {
+        return this.inner().creationTime();
+    }
+
     @Override
     public List<String> disabledAlerts() {
         return this.inner().disabledAlerts();
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyInner.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyInner.java
index 2441ffcb32c1..570608e864c5 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyInner.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/ServerSecurityAlertPolicyInner.java
@@ -10,6 +10,7 @@
 
 import com.microsoft.azure.management.sql.v2017_03_01_preview.SecurityAlertPolicyState;
 import java.util.List;
+import org.joda.time.DateTime;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 import com.microsoft.azure.ProxyResource;
@@ -20,8 +21,9 @@
 @JsonFlatten
 public class ServerSecurityAlertPolicyInner extends ProxyResource {
     /**
-     * Specifies the state of the policy, whether it is enabled or disabled.
-     * Possible values include: 'New', 'Enabled', 'Disabled'.
+     * Specifies the state of the policy, whether it is enabled or disabled or
+     * a policy has not been applied yet on the specific database. Possible
+     * values include: 'New', 'Enabled', 'Disabled'.
      */
     @JsonProperty(value = "properties.state", required = true)
     private SecurityAlertPolicyState state;
@@ -68,7 +70,13 @@ public class ServerSecurityAlertPolicyInner extends ProxyResource {
     private Integer retentionDays;
 
     /**
-     * Get specifies the state of the policy, whether it is enabled or disabled. Possible values include: 'New', 'Enabled', 'Disabled'.
+     * Specifies the UTC creation time of the policy.
+     */
+    @JsonProperty(value = "properties.creationTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime creationTime;
+
+    /**
+     * Get specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'.
      *
      * @return the state value
      */
@@ -77,7 +85,7 @@ public SecurityAlertPolicyState state() {
     }
 
     /**
-     * Set specifies the state of the policy, whether it is enabled or disabled. Possible values include: 'New', 'Enabled', 'Disabled'.
+     * Set specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. Possible values include: 'New', 'Enabled', 'Disabled'.
      *
      * @param state the state value to set
      * @return the ServerSecurityAlertPolicyInner object itself.
@@ -207,4 +215,13 @@ public ServerSecurityAlertPolicyInner withRetentionDays(Integer retentionDays) {
         return this;
     }
 
+    /**
+     * Get specifies the UTC creation time of the policy.
+     *
+     * @return the creationTime value
+     */
+    public DateTime creationTime() {
+        return this.creationTime;
+    }
+
 }
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManagementClientImpl.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManagementClientImpl.java
index b0723cfc11d2..b54d7e5b6ba0 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManagementClientImpl.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManagementClientImpl.java
@@ -418,6 +418,32 @@ public ManagedDatabasesInner managedDatabases() {
         return this.managedDatabases;
     }
 
+    /**
+     * The ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner object to access its operations.
+     */
+    private ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies;
+
+    /**
+     * Gets the ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner object to access its operations.
+     * @return the ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner object.
+     */
+    public ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies() {
+        return this.managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies;
+    }
+
+    /**
+     * The RestorableDroppedManagedDatabasesInner object to access its operations.
+     */
+    private RestorableDroppedManagedDatabasesInner restorableDroppedManagedDatabases;
+
+    /**
+     * Gets the RestorableDroppedManagedDatabasesInner object to access its operations.
+     * @return the RestorableDroppedManagedDatabasesInner object.
+     */
+    public RestorableDroppedManagedDatabasesInner restorableDroppedManagedDatabases() {
+        return this.restorableDroppedManagedDatabases;
+    }
+
     /**
      * The RestorePointsInner object to access its operations.
      */
@@ -470,6 +496,71 @@ public ServerSecurityAlertPoliciesInner serverSecurityAlertPolicies() {
         return this.serverSecurityAlertPolicies;
     }
 
+    /**
+     * The ManagedDatabaseSecurityAlertPoliciesInner object to access its operations.
+     */
+    private ManagedDatabaseSecurityAlertPoliciesInner managedDatabaseSecurityAlertPolicies;
+
+    /**
+     * Gets the ManagedDatabaseSecurityAlertPoliciesInner object to access its operations.
+     * @return the ManagedDatabaseSecurityAlertPoliciesInner object.
+     */
+    public ManagedDatabaseSecurityAlertPoliciesInner managedDatabaseSecurityAlertPolicies() {
+        return this.managedDatabaseSecurityAlertPolicies;
+    }
+
+    /**
+     * The ManagedServerSecurityAlertPoliciesInner object to access its operations.
+     */
+    private ManagedServerSecurityAlertPoliciesInner managedServerSecurityAlertPolicies;
+
+    /**
+     * Gets the ManagedServerSecurityAlertPoliciesInner object to access its operations.
+     * @return the ManagedServerSecurityAlertPoliciesInner object.
+     */
+    public ManagedServerSecurityAlertPoliciesInner managedServerSecurityAlertPolicies() {
+        return this.managedServerSecurityAlertPolicies;
+    }
+
+    /**
+     * The SensitivityLabelsInner object to access its operations.
+     */
+    private SensitivityLabelsInner sensitivityLabels;
+
+    /**
+     * Gets the SensitivityLabelsInner object to access its operations.
+     * @return the SensitivityLabelsInner object.
+     */
+    public SensitivityLabelsInner sensitivityLabels() {
+        return this.sensitivityLabels;
+    }
+
+    /**
+     * The RecommendedSensitivityLabelsInner object to access its operations.
+     */
+    private RecommendedSensitivityLabelsInner recommendedSensitivityLabels;
+
+    /**
+     * Gets the RecommendedSensitivityLabelsInner object to access its operations.
+     * @return the RecommendedSensitivityLabelsInner object.
+     */
+    public RecommendedSensitivityLabelsInner recommendedSensitivityLabels() {
+        return this.recommendedSensitivityLabels;
+    }
+
+    /**
+     * The ManagedInstanceAdministratorsInner object to access its operations.
+     */
+    private ManagedInstanceAdministratorsInner managedInstanceAdministrators;
+
+    /**
+     * Gets the ManagedInstanceAdministratorsInner object to access its operations.
+     * @return the ManagedInstanceAdministratorsInner object.
+     */
+    public ManagedInstanceAdministratorsInner managedInstanceAdministrators() {
+        return this.managedInstanceAdministrators;
+    }
+
     /**
      * Initializes an instance of SqlManagementClient client.
      *
@@ -527,10 +618,17 @@ protected void initialize() {
         this.backupLongTermRetentionPolicies = new BackupLongTermRetentionPoliciesInner(restClient().retrofit(), this);
         this.managedBackupShortTermRetentionPolicies = new ManagedBackupShortTermRetentionPoliciesInner(restClient().retrofit(), this);
         this.managedDatabases = new ManagedDatabasesInner(restClient().retrofit(), this);
+        this.managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies = new ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesInner(restClient().retrofit(), this);
+        this.restorableDroppedManagedDatabases = new RestorableDroppedManagedDatabasesInner(restClient().retrofit(), this);
         this.restorePoints = new RestorePointsInner(restClient().retrofit(), this);
         this.serverAutomaticTunings = new ServerAutomaticTuningsInner(restClient().retrofit(), this);
         this.serverDnsAliases = new ServerDnsAliasesInner(restClient().retrofit(), this);
         this.serverSecurityAlertPolicies = new ServerSecurityAlertPoliciesInner(restClient().retrofit(), this);
+        this.managedDatabaseSecurityAlertPolicies = new ManagedDatabaseSecurityAlertPoliciesInner(restClient().retrofit(), this);
+        this.managedServerSecurityAlertPolicies = new ManagedServerSecurityAlertPoliciesInner(restClient().retrofit(), this);
+        this.sensitivityLabels = new SensitivityLabelsInner(restClient().retrofit(), this);
+        this.recommendedSensitivityLabels = new RecommendedSensitivityLabelsInner(restClient().retrofit(), this);
+        this.managedInstanceAdministrators = new ManagedInstanceAdministratorsInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
     }
 
diff --git a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManager.java b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManager.java
index 17ec28e13069..780f09acd688 100644
--- a/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManager.java
+++ b/sql/resource-manager/v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/implementation/SqlManager.java
@@ -38,10 +38,17 @@
 import com.microsoft.azure.management.sql.v2017_03_01_preview.BackupLongTermRetentionPolicies;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedBackupShortTermRetentionPolicies;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabases;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorableDroppedManagedDatabases;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.RestorePoints;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ServerAutomaticTunings;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ServerDnsAliases;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ServerSecurityAlertPolicies;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedDatabaseSecurityAlertPolicies;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedServerSecurityAlertPolicies;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.SensitivityLabels;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.RecommendedSensitivityLabels;
+import com.microsoft.azure.management.sql.v2017_03_01_preview.ManagedInstanceAdministrators;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
@@ -71,10 +78,17 @@ public final class SqlManager extends ManagerCore<SqlManager, SqlManagementClien
     private BackupLongTermRetentionPolicies backupLongTermRetentionPolicies;
     private ManagedBackupShortTermRetentionPolicies managedBackupShortTermRetentionPolicies;
     private ManagedDatabases managedDatabases;
+    private ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies;
+    private RestorableDroppedManagedDatabases restorableDroppedManagedDatabases;
     private RestorePoints restorePoints;
     private ServerAutomaticTunings serverAutomaticTunings;
     private ServerDnsAliases serverDnsAliases;
     private ServerSecurityAlertPolicies serverSecurityAlertPolicies;
+    private ManagedDatabaseSecurityAlertPolicies managedDatabaseSecurityAlertPolicies;
+    private ManagedServerSecurityAlertPolicies managedServerSecurityAlertPolicies;
+    private SensitivityLabels sensitivityLabels;
+    private RecommendedSensitivityLabels recommendedSensitivityLabels;
+    private ManagedInstanceAdministrators managedInstanceAdministrators;
     /**
     * Get a Configurable instance that can be used to create SqlManager with optional configuration.
     *
@@ -342,6 +356,26 @@ public ManagedDatabases managedDatabases() {
         return this.managedDatabases;
     }
 
+    /**
+     * @return Entry point to manage ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies.
+     */
+    public ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies() {
+        if (this.managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies == null) {
+            this.managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies = new ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImpl(this);
+        }
+        return this.managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies;
+    }
+
+    /**
+     * @return Entry point to manage RestorableDroppedManagedDatabases.
+     */
+    public RestorableDroppedManagedDatabases restorableDroppedManagedDatabases() {
+        if (this.restorableDroppedManagedDatabases == null) {
+            this.restorableDroppedManagedDatabases = new RestorableDroppedManagedDatabasesImpl(this);
+        }
+        return this.restorableDroppedManagedDatabases;
+    }
+
     /**
      * @return Entry point to manage RestorePoints.
      */
@@ -382,6 +416,56 @@ public ServerSecurityAlertPolicies serverSecurityAlertPolicies() {
         return this.serverSecurityAlertPolicies;
     }
 
+    /**
+     * @return Entry point to manage ManagedDatabaseSecurityAlertPolicies.
+     */
+    public ManagedDatabaseSecurityAlertPolicies managedDatabaseSecurityAlertPolicies() {
+        if (this.managedDatabaseSecurityAlertPolicies == null) {
+            this.managedDatabaseSecurityAlertPolicies = new ManagedDatabaseSecurityAlertPoliciesImpl(this);
+        }
+        return this.managedDatabaseSecurityAlertPolicies;
+    }
+
+    /**
+     * @return Entry point to manage ManagedServerSecurityAlertPolicies.
+     */
+    public ManagedServerSecurityAlertPolicies managedServerSecurityAlertPolicies() {
+        if (this.managedServerSecurityAlertPolicies == null) {
+            this.managedServerSecurityAlertPolicies = new ManagedServerSecurityAlertPoliciesImpl(this);
+        }
+        return this.managedServerSecurityAlertPolicies;
+    }
+
+    /**
+     * @return Entry point to manage SensitivityLabels.
+     */
+    public SensitivityLabels sensitivityLabels() {
+        if (this.sensitivityLabels == null) {
+            this.sensitivityLabels = new SensitivityLabelsImpl(this);
+        }
+        return this.sensitivityLabels;
+    }
+
+    /**
+     * @return Entry point to manage RecommendedSensitivityLabels.
+     */
+    public RecommendedSensitivityLabels recommendedSensitivityLabels() {
+        if (this.recommendedSensitivityLabels == null) {
+            this.recommendedSensitivityLabels = new RecommendedSensitivityLabelsImpl(this);
+        }
+        return this.recommendedSensitivityLabels;
+    }
+
+    /**
+     * @return Entry point to manage ManagedInstanceAdministrators.
+     */
+    public ManagedInstanceAdministrators managedInstanceAdministrators() {
+        if (this.managedInstanceAdministrators == null) {
+            this.managedInstanceAdministrators = new ManagedInstanceAdministratorsImpl(this);
+        }
+        return this.managedInstanceAdministrators;
+    }
+
     /**
     * The implementation for Configurable interface.
     */