From bf6a460526776677f092314a72806f1aeeae51f8 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Wed, 10 Jul 2019 16:27:48 -0700 Subject: [PATCH 01/16] Linting, builder refactor and playback tests --- .../resources/spotbugs/spotbugs-exclude.xml | 7 + eng/spotbugs-aggregate-report/pom.xml | 7 + pom.client.xml | 6 + pom.xml | 7 + storage/client/queue/package-info.java | 7 + storage/client/queue/pom.xml | 93 +++ .../credentials/SharedKeyCredential.java | 34 +- .../common/policy/RequestRetryOptions.java | 3 + .../common/policy/RequestRetryPolicy.java | 4 + .../azure/storage/queue/QueueAsyncClient.java | 528 ++++++++++++- .../queue/QueueAsyncClientBuilder.java | 5 - .../com/azure/storage/queue/QueueClient.java | 439 +++++++++++ .../storage/queue/QueueClientBuilder.java | 339 +++++++++ .../storage/queue/QueueConfiguration.java | 12 + .../queue/QueueServiceAsyncClient.java | 342 +++++++++ .../storage/queue/QueueServiceClient.java | 273 +++++++ .../queue/QueueServiceClientBuilder.java | 289 ++++++++ .../java/com/azure/storage/queue/README.md | 377 ++++++++++ .../AzureQueueStorageBuilder.java | 4 +- .../queue/implementation/MessageIdsImpl.java | 21 +- .../queue/implementation/MessagesImpl.java | 41 +- .../queue/implementation/QueuesImpl.java | 64 +- .../queue/implementation/ServicesImpl.java | 3 +- ...dMessageItem.java => DequeuedMessage.java} | 31 +- .../queue/models/MessagesDequeueResponse.java | 6 +- .../queue/models/MessagesPeekResponse.java | 6 +- ...kedMessageItem.java => PeekedMessage.java} | 23 +- .../storage/queue/models/QueueProperties.java | 38 + .../queue/models/QueuesSegmentOptions.java | 89 +++ .../storage/queue/models/UpdatedMessage.java | 39 + .../com/azure/storage/queue/AsyncSamples.java | 47 ++ .../azure/storage/queue/MessageSample.java | 77 ++ .../storage/queue/QueueExceptionSamples.java | 74 ++ .../storage/queue/QueueServiceSample.java | 37 + .../javadoc/QueueJavaDocCodeSamples.java | 285 +++++++ .../QueueServiceJavaDocCodeSamples.java | 149 ++++ .../storage/queue/QueueAsyncClientTests.java | 695 ++++++++++++++++++ .../azure/storage/queue/QueueClientTests.java | 654 ++++++++++++++++ .../storage/queue/QueueClientTestsBase.java | 148 ++++ .../queue/QueueServiceAsyncClientTests.java | 250 +++++++ .../queue/QueueServiceClientTests.java | 257 +++++++ .../queue/QueueServiceClientTestsBase.java | 67 ++ .../com/azure/storage/queue/TestHelpers.java | 154 ++++ .../session-records/clearMessages.json | 161 ++++ .../clearMessagesQueueDoesNotExist.json | 42 ++ .../session-records/createQueue.json | 90 +++ .../createQueueTwiceDifferentMetadata.json | 90 +++ .../createQueueTwiceSameMetadata.json | 125 ++++ .../createQueueWithMetadata.json | 91 +++ .../createTwiceDifferentMetadata.json | 71 ++ .../createTwiceSameMetadata.json | 68 ++ .../session-records/createWithMetadata.json | 72 ++ .../session-records/createWithSASToken.json | 23 + .../session-records/createWithSharedKey.json | 23 + .../session-records/deleteExisting.json | 94 +++ .../session-records/deleteExistingQueue.json | 75 ++ .../session-records/deleteMessage.json | 124 ++++ .../deleteMessageInvalidMessageId.json | 109 +++ .../deleteMessageInvalidPopReceipt.json | 109 +++ .../deleteMessageQueueDoesNotExist.json | 42 ++ .../session-records/deleteMetadata.json | 106 +++ .../session-records/deleteNonExistent.json | 42 ++ .../deleteNonExistentQueue.json | 42 ++ .../session-records/dequeueMessage.json | 90 +++ .../dequeueMultipleMessages.json | 109 +++ .../dequeueQueueDoesNotExist.json | 42 ++ .../dequeueTooManyMessages.json | 71 ++ .../session-records/enqueueEmptyMessage.json | 90 +++ .../session-records/enqueueMessage.json | 90 +++ .../enqueueQueueDoesNotExist.json | 43 ++ .../enqueueShortTimeToLiveMessage.json | 90 +++ .../session-records/getAccessPolicy.json | 71 ++ .../getAccessPolicyQueueDoesNotExist.json | 42 ++ .../session-records/getProperties.json | 72 ++ .../getPropertiesQueueDoesNotExist.json | 42 ++ .../getQueueDoesNotCreateAQueue.json | 43 ++ .../resources/session-records/listQueues.json | 186 +++++ .../listQueuesIncludeMetadata.json | 186 +++++ .../session-records/listQueuesWithPrefix.json | 186 +++++ .../session-records/peekMessage.json | 90 +++ .../session-records/peekMultipleMessages.json | 109 +++ .../peekQueueDoesNotExist.json | 42 ++ .../session-records/peekTooManyMessages.json | 71 ++ .../session-records/setAccessPolicy.json | 88 +++ .../setAccessPolicyQueueDoesNotExist.json | 43 ++ .../setInvalidAccessPolicy.json | 72 ++ .../session-records/setInvalidMetadata.json | 71 ++ .../session-records/setMetadata.json | 88 +++ .../setMetadataQueueDoesNotExist.json | 42 ++ .../session-records/setProperties.json | 114 +++ .../setTooManyAccessPolicies.json | 72 ++ .../session-records/updateMessage.json | 128 ++++ .../updateMessageInvalidMessageId.json | 110 +++ .../updateMessageInvalidPopReceipt.json | 110 +++ .../updateMessageQueueDoesNotExist.json | 43 ++ 95 files changed, 10240 insertions(+), 136 deletions(-) create mode 100644 storage/client/queue/package-info.java create mode 100644 storage/client/queue/pom.xml delete mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClientBuilder.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/README.md rename storage/client/queue/src/main/java/com/azure/storage/queue/models/{DequeuedMessageItem.java => DequeuedMessage.java} (85%) rename storage/client/queue/src/main/java/com/azure/storage/queue/models/{PeekedMessageItem.java => PeekedMessage.java} (85%) create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/models/QueueProperties.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/models/QueuesSegmentOptions.java create mode 100644 storage/client/queue/src/main/java/com/azure/storage/queue/models/UpdatedMessage.java create mode 100644 storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java create mode 100644 storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSample.java create mode 100644 storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java create mode 100644 storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSample.java create mode 100644 storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java create mode 100644 storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java create mode 100644 storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java create mode 100644 storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java create mode 100644 storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java create mode 100644 storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java create mode 100644 storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java create mode 100644 storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java create mode 100644 storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java create mode 100644 storage/client/queue/src/test/resources/session-records/clearMessages.json create mode 100644 storage/client/queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/createQueue.json create mode 100644 storage/client/queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/createQueueWithMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/createTwiceDifferentMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/createTwiceSameMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/createWithMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/createWithSASToken.json create mode 100644 storage/client/queue/src/test/resources/session-records/createWithSharedKey.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteExisting.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteExistingQueue.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteMessage.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteNonExistent.json create mode 100644 storage/client/queue/src/test/resources/session-records/deleteNonExistentQueue.json create mode 100644 storage/client/queue/src/test/resources/session-records/dequeueMessage.json create mode 100644 storage/client/queue/src/test/resources/session-records/dequeueMultipleMessages.json create mode 100644 storage/client/queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/dequeueTooManyMessages.json create mode 100644 storage/client/queue/src/test/resources/session-records/enqueueEmptyMessage.json create mode 100644 storage/client/queue/src/test/resources/session-records/enqueueMessage.json create mode 100644 storage/client/queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json create mode 100644 storage/client/queue/src/test/resources/session-records/getAccessPolicy.json create mode 100644 storage/client/queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/getProperties.json create mode 100644 storage/client/queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json create mode 100644 storage/client/queue/src/test/resources/session-records/listQueues.json create mode 100644 storage/client/queue/src/test/resources/session-records/listQueuesIncludeMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/listQueuesWithPrefix.json create mode 100644 storage/client/queue/src/test/resources/session-records/peekMessage.json create mode 100644 storage/client/queue/src/test/resources/session-records/peekMultipleMessages.json create mode 100644 storage/client/queue/src/test/resources/session-records/peekQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/peekTooManyMessages.json create mode 100644 storage/client/queue/src/test/resources/session-records/setAccessPolicy.json create mode 100644 storage/client/queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/setInvalidAccessPolicy.json create mode 100644 storage/client/queue/src/test/resources/session-records/setInvalidMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/setMetadata.json create mode 100644 storage/client/queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json create mode 100644 storage/client/queue/src/test/resources/session-records/setProperties.json create mode 100644 storage/client/queue/src/test/resources/session-records/setTooManyAccessPolicies.json create mode 100644 storage/client/queue/src/test/resources/session-records/updateMessage.json create mode 100644 storage/client/queue/src/test/resources/session-records/updateMessageInvalidMessageId.json create mode 100644 storage/client/queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json create mode 100644 storage/client/queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json 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 f7e3bcb5eb317..9f5f5eaf610ed 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 @@ -406,6 +406,12 @@ + + + + + + @@ -439,6 +445,7 @@ + diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml index df95e28e5936a..f7d23bdcc4068 100644 --- a/eng/spotbugs-aggregate-report/pom.xml +++ b/eng/spotbugs-aggregate-report/pom.xml @@ -27,6 +27,7 @@ 1.0.0-preview.1 4.0.0-preview.1 5.0.0-preview.2 + 12.0.0-preview.1 @@ -58,6 +59,7 @@ ..\..\core\azure-core-test\src\main\java ..\..\eventhubs\client\azure-eventhubs\src\main\java ..\..\eventhubs\client\azure-eventhubs\src\samples\java + ..\..\storage\client\queue\src\samples\java @@ -142,6 +144,11 @@ azure-data-appconfiguration ${azure-data-appconfiguration.version} + + com.azure + azure-storage-queue + ${azure-storage-queue.version} + com.azure azure-messaging-eventhubs diff --git a/pom.client.xml b/pom.client.xml index 0d04e6b9d0273..8598477c9cfa8 100644 --- a/pom.client.xml +++ b/pom.client.xml @@ -389,6 +389,10 @@ Azure Storage - Blobs com.azure.storage.blob* + + Azure Storage - Queues + com.azure.storage.client.queue* + https://docs.oracle.com/javase/8/docs/api/ @@ -542,6 +546,7 @@ -snippetpath ${project.basedir}/eventhubs/client/azure-eventhubs/src/samples/java -snippetpath ${project.basedir}/keyvault/client/keys/src/samples/java -snippetpath ${project.basedir}/keyvault/client/secrets/src/samples/java + -snippetpath ${project.basedir}/storage/client/queue/src/samples/java @@ -745,5 +750,6 @@ ./sdk/identity/azure-identity ./storage/client/blob + ./storage/client/queue diff --git a/pom.xml b/pom.xml index 125c326f84890..e2fc0333ff915 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,13 @@ azure-sdk-all pom 1.0.0 + + + com.azure + azure-core + 1.0.0-preview.2 + + Microsoft Azure SDK for Java - All Modules Aggregated POM for Microsoft Azure SDK for Java diff --git a/storage/client/queue/package-info.java b/storage/client/queue/package-info.java new file mode 100644 index 0000000000000..e6671d8292fac --- /dev/null +++ b/storage/client/queue/package-info.java @@ -0,0 +1,7 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +/** + * This package contains the classes to perform actions on Azure Storage Queue. + */ +package com.azure.storage.queue; diff --git a/storage/client/queue/pom.xml b/storage/client/queue/pom.xml new file mode 100644 index 0000000000000..7e5846edf40ad --- /dev/null +++ b/storage/client/queue/pom.xml @@ -0,0 +1,93 @@ + + + + com.azure + azure-client-sdk-parent + 1.1.0 + ../../../pom.client.xml + + + 4.0.0 + + com.azure + azure-storage-queue + 12.0.0-preview.1 + + azure-storage-queue + https://github.com/Azure/azure-sdk-for-java + + + + azure-java-build-docs + ${site.url}/site/${project.artifactId} + + + + + scm:git:https://github.com/Azure/azure-sdk-for-java + scm:git:git@github.com:Azure/azure-sdk-for-java.git + HEAD + + + + + com.azure + azure-core + 1.0.0-preview.2 + + + org.slf4j + slf4j-api + + + + com.azure + azure-core-test + 1.0.0-preview.2 + test + + + com.azure + azure-identity + 1.0.0-preview.1 + test + + + junit + junit + test + + + org.slf4j + slf4j-simple + test + + + io.projectreactor + reactor-test + test + + + com.microsoft.azure + adal4j + test + + + org.spockframework + spock-core + test + + + cglib + cglib-nodep + test + + + uk.org.lidalia + slf4j-test + test + + + diff --git a/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java b/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java index 19b2b4c307221..2b5f5d5f3cf5f 100644 --- a/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java +++ b/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java @@ -29,8 +29,8 @@ public final class SharedKeyCredential { private static final String AUTHORIZATION_HEADER_FORMAT = "SharedKey %s:%s"; // Pieces of the connection string that are needed. - private static final String ACCOUNT_NAME = "AccountName".toLowerCase(); - private static final String ACCOUNT_KEY = "AccountKey".toLowerCase(); + private static final String ACCOUNT_NAME = "accountname"; + private static final String ACCOUNT_KEY = "accountkey"; private final String accountName; private final byte[] accountKey; @@ -59,7 +59,7 @@ public static SharedKeyCredential fromConnectionString(String connectionString) HashMap connectionStringPieces = new HashMap<>(); for (String connectionStringPiece : connectionString.split(";")) { String[] kvp = connectionStringPiece.split("=", 2); - connectionStringPieces.put(kvp[0].toLowerCase(), kvp[1]); + connectionStringPieces.put(kvp[0].toLowerCase(Locale.ROOT), kvp[1]); } String accountName = connectionStringPieces.get(ACCOUNT_NAME); @@ -98,9 +98,11 @@ public String generateAuthorizationHeader(URL requestURL, String httpMethod, Map * * @param stringToSign The UTF-8-encoded string to sign. * @return A {@code String} that contains the HMAC-SHA256-encoded signature. - * @throws InvalidKeyException If the accountKey is not a valid Base64-encoded string. + * @throws RuntimeException for one of the following cases: + * - If the HMAC-SHA256 signature for {@code sharedKeyCredentials} fails to generate. + * - If the an invalid key has been given to the client. */ - public String computeHmac256(final String stringToSign) throws InvalidKeyException { + public String computeHmac256(final String stringToSign) { try { /* We must get a new instance of the Mac calculator for each signature calculated because the instances are @@ -111,8 +113,10 @@ public String computeHmac256(final String stringToSign) throws InvalidKeyExcepti hmacSha256.init(new SecretKeySpec(this.accountKey, "HmacSHA256")); byte[] utf8Bytes = stringToSign.getBytes(StandardCharsets.UTF_8); return Base64.getEncoder().encodeToString(hmacSha256.doFinal(utf8Bytes)); - } catch (final NoSuchAlgorithmException e) { - throw new Error(e); + } catch (final NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } catch (InvalidKeyException e) { + throw new RuntimeException("Please double check the account key. Error details: " + e.getMessage()); } } @@ -121,20 +125,20 @@ private String buildStringToSign(URL requestURL, String httpMethod, MapSample Code

* *

For more samples, please see the samples file

+ * @throws IllegalArgumentException If one of the following case exists: + * - There is only one null value for retryDelay and maxRetryDelay. + * - Unrecognized retry policy type. */ public RequestRetryOptions(RetryPolicyType retryPolicyType, Integer maxTries, Integer tryTimeout, Long retryDelayInMs, Long maxRetryDelayInMs, String secondaryHost) { diff --git a/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryPolicy.java b/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryPolicy.java index b862b76928af0..1b4bf56936bf5 100644 --- a/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryPolicy.java +++ b/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryPolicy.java @@ -30,6 +30,10 @@ public final class RequestRetryPolicy implements HttpPipelinePolicy { private final RequestRetryOptions requestRetryOptions; + /** + * Create a policy of retrying a given HTTP request. + * @param requestRetryOptions Options for configuring the RequestRetryPolicy. + */ public RequestRetryPolicy(RequestRetryOptions requestRetryOptions) { this.requestRetryOptions = requestRetryOptions; } diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java index eab2a19707d5c..4ebb74cbdfa2f 100644 --- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java +++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java @@ -1,29 +1,527 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.azure.storage.queue; -import com.azure.core.ServiceClient; import com.azure.core.http.HttpPipeline; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.SimpleResponse; +import com.azure.core.http.rest.VoidResponse; +import com.azure.core.util.Context; +import com.azure.storage.common.credentials.SASTokenCredential; +import com.azure.storage.common.credentials.SharedKeyCredential; import com.azure.storage.queue.implementation.AzureQueueStorageBuilder; import com.azure.storage.queue.implementation.AzureQueueStorageImpl; - +import com.azure.storage.queue.models.DequeuedMessage; +import com.azure.storage.queue.models.EnqueuedMessage; +import com.azure.storage.queue.models.MessageIdUpdateHeaders; +import com.azure.storage.queue.models.MessageIdsUpdateResponse; +import com.azure.storage.queue.models.PeekedMessage; +import com.azure.storage.queue.models.QueueGetPropertiesHeaders; +import com.azure.storage.queue.models.QueueMessage; +import com.azure.storage.queue.models.QueueProperties; +import com.azure.storage.queue.models.QueuesGetPropertiesResponse; +import com.azure.storage.queue.models.SignedIdentifier; +import com.azure.storage.queue.models.StorageErrorException; +import com.azure.storage.queue.models.UpdatedMessage; +import java.net.MalformedURLException; import java.net.URL; +import java.time.Duration; +import java.util.List; +import java.util.Map; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * This class provides a client that contains all the operations for interacting with a queue in Azure Storage Queue. + * Operations allowed by the client are creating and deleting the queue, retrieving and updating metadata and access + * policies of the queue, and enqueuing, dequeuing, peeking, updating, and deleting messages. + * + *

Instantiating an Asynchronous Queue Client

+ * + * 
+ * QueueAsyncClient client = QueueAsyncClient.builder()
+ *     .connectionString(connectionString)
+ *     .endpoint(endpoint)
+ *     .queueName(queueName)
+ *     .buildAsyncClient();
+ *
+ * + *

View {@link QueueClientBuilder this} for additional ways to construct the client.

+ * + * @see QueueClientBuilder + * @see QueueClient + * @see SharedKeyCredential + * @see SASTokenCredential + */ +public final class QueueAsyncClient { + private final AzureQueueStorageImpl client; + private final String queueName; + + /** + * Creates a QueueAsyncClient that sends requests to the storage queue service at {@link AzureQueueStorageImpl#url() endpoint}. + * Each service call goes through the {@link HttpPipeline pipeline} in the {@code client}. + * + * @param client Client that interacts with the service interfaces + * @param queueName Name of the queue + */ + QueueAsyncClient(AzureQueueStorageImpl client, String queueName) { + this.queueName = queueName; + + this.client = new AzureQueueStorageBuilder().pipeline(client.httpPipeline()) + .url(client.url()) + .version(client.version()) + .build(); + } + + /** + * Creates a QueueAsyncClient that sends requests to the storage queue service at {@code endpoint}. + * Each service call goes through the {@code httpPipeline}. + * + * @param endpoint URL for the Storage Queue service + * @param httpPipeline HttpPipeline that the HTTP requests and response flow through + * @param queueName Name of the queue + */ + QueueAsyncClient(URL endpoint, HttpPipeline httpPipeline, String queueName) { + this.queueName = queueName; + + this.client = new AzureQueueStorageBuilder().pipeline(httpPipeline) + .url(endpoint.toString()) + .build(); + } + + /** + * @return the URL of the storage queue + * @throws RuntimeException If the queue is using a malformed URL. + */ + public URL getQueueUrl() { + try { + return new URL(client.url()); + } catch (MalformedURLException ex) { + throw new RuntimeException("Queue URL is malformed"); + } + } + + /** + * Creates a new queue. + * + *

Code Samples

+ * + *

Create a queue

+ * + * {@codesnippet com.azure.storage.queue.queueAsyncClient.create} + * + * @return A response that only contains headers and response status code + * @throws StorageErrorException If a queue with the same name already exists in the queue service. + */ + public Mono create() { + return create(null); + } + + /** + * Creates a new queue. + * + *

Code Samples

+ * + *

Create a queue with metadata "queue:metadataMap"

+ * + * 
+     * client.create(Collections.singletonMap("queue", "metadataMap"))
+     *     .subscribe(response -> System.out.printf("Create completed with status code %d", response.statusCode()));
+     *
+ * + * @param metadata Metadata to associate with the queue + * @return A response that only contains headers and response status code + * @throws StorageErrorException If a queue with the same name and different metadata already exists in the queue service. + */ + public Mono create(Map metadata) { + return client.queues().createWithRestResponseAsync(queueName, null, metadata, null, Context.NONE) + .map(VoidResponse::new); + } + + /** + * Permanently deletes the queue. + * + *

Code Samples

+ * + *

Delete a queue

+ * + * {@codesnippet com.azure.storage.queue.queueAsyncClient.delete} + * + * @return A response that only contains headers and response status code + * @throws StorageErrorException If the queue doesn't exist + */ + public Mono delete() { + return client.queues().deleteWithRestResponseAsync(queueName, Context.NONE) + .map(VoidResponse::new); + } + + /** + * Retrieves metadata and approximate message count of the queue. + * + *

Code Samples

+ * + *

Get the properties of the queue

+ * + * 
+     * client.getProperties()
+     *     .subscribe(response -> {
+     *         QueueProperties properties = response.value();
+     *         System.out.printf("Metadata: %s, Approximate message count: %d", properties.metadata(), properties.approximateMessagesCount());
+     *     });
+     *
+ * + * @return A response containing a {@link QueueProperties} value which contains the metadata and approximate + * messages count of the queue. + * @throws StorageErrorException If the queue doesn't exist + */ + public Mono> getProperties() { + return client.queues().getPropertiesWithRestResponseAsync(queueName, Context.NONE) + .map(this::getQueuePropertiesResponse); + } + + /** + * Sets the metadata of the queue. + * + * Passing in a {@code null} value for metadata will clear the metadata associated with the queue. + * + *

Code Samples

+ * + *

Set the queue's metadata to "queue:metadataMap"

+ * + * 
+     * client.setMetadata(Collections.singletonMap("queue", "metadataMap"))
+     *     .subscribe(response -> System.out.printf("Setting metadata completed with status code %d", response.statusCode()));
+     *
+ * + *

Clear the queue's metadata

+ * + * 
+     * client.setMetadata(null)
+     *     .subscribe(response -> System.out.printf("Clearing metadata completed with status code %d", response.statusCode()));
+     *
+ * + * @param metadata Metadata to set on the queue + * @return A response that only contains headers and response status code + * @throws StorageErrorException If the queue doesn't exist + */ + public Mono setMetadata(Map metadata) { + return client.queues().setMetadataWithRestResponseAsync(queueName, null, metadata, null, Context.NONE) + .map(VoidResponse::new); + } + + /** + * Retrieves stored access policies specified on the queue. + * + *

Code Samples

+ * + *

List the stored access policies

+ * + * 
+     * client.getAccessPolicy()
+     *     .subscribe(result -> System.out.printf("Access policy %s allows these permissions: %s", result.id(), result.accessPolicy().permission()));
+     *
+ * + * @return The stored access policies specified on the queue. + * @throws StorageErrorException If the queue doesn't exist + */ + public Flux getAccessPolicy() { + return client.queues().getAccessPolicyWithRestResponseAsync(queueName, Context.NONE) + .flatMapMany(response -> Flux.fromIterable(response.value())); + } + + /** + * Sets stored access policies on the queue. + * + *

Code Samples

+ * + *

Set a read only stored access policy

+ * + * 
+     * AccessPolicy policy = new AccessPolicy().permission("r")
+     *     .start(OffsetDateTime.now(ZoneOffset.UTC))
+     *     .expiry(OffsetDateTime.now(ZoneOffset.UTC).addDays(10));
+     *
+     * SignedIdentifier permission = new SignedIdentifier().id("mypolicy").accessPolicy(accessPolicy);
+     *
+     * client.setAccessPolicy(Collections.singletonList(permission))
+     *     .subscribe(response -> System.out.printf("Setting access policies completed with status code %d", response.statusCode()));
+     *
+ * + * @param permissions Access policies to set on the queue + * @return A response that only contains headers and response status code + * @throws StorageErrorException If the queue doesn't exist, a stored access policy doesn't have all fields filled out, + * or the queue will have more than five policies. + */ + public Mono setAccessPolicy(List permissions) { + return client.queues().setAccessPolicyWithRestResponseAsync(queueName, permissions, null, null, Context.NONE) + .map(VoidResponse::new); + } + + /** + * Deletes all messages in the queue. + * + *

Code Samples

+ * + *

Clear the messages

+ * + * 
+     * client.clear()
+     *     .subscribe(response -> System.out.printf("Clearing messages completed with status code %d", response.statusCode()));
+     *
+ * + * @return A response that only contains headers and response status code + * @throws StorageErrorException If the queue doesn't exist + */ + public Mono clearMessages() { + return client.messages().clearWithRestResponseAsync(queueName, Context.NONE) + .map(VoidResponse::new); + } + + /** + * Enqueues a message that has a time-to-live of 7 days and is instantly visible. + * + *

Code Samples

+ * + *

Enqueue a message of "Hello, Azure"

+ * + * {@codesnippet com.azure.storage.queue.queueAsyncClient.enqueueMessage#string} + * + * @param messageText Message text + * @return A {@link EnqueuedMessage} value that contains the {@link EnqueuedMessage#messageId() messageId} and + * {@link EnqueuedMessage#popReceipt() popReceipt} that are used to interact with the message and other metadata + * about the enqueued message. + * @throws StorageErrorException If the queue doesn't exist + */ + public Mono> enqueueMessage(String messageText) { + return enqueueMessage(messageText, Duration.ofSeconds(0), Duration.ofDays(7)); + } + + /** + * Enqueues a message with a given time-to-live and a timeout period where the message is invisible in the queue. + * + *

Code Samples

+ * + *

Add a message of "Hello, Azure" that has a timeout of 5 seconds

+ * + * 
+     * client.enqueueMessage("Hello, Azure", Duration.ofSeconds(5), null)
+     *     .subscribe(response -> {
+     *         EnqueuedMessage enqueuedMessage = response.value();
+     *         System.out.printf("Message %s becomes visible at %s", enqueuedMessage.messageId(), enqueuedMessage.timeNextVisible());
+     *     });
+     *
+ * + *

Add a message of "Goodbye, Azure" that has a time to live of 5 seconds

+ * + * 
+     * client.enqueueMessage("Goodbye, Azure", null, Duration.ofSeconds(5))
+     *     .subscribe(response -> {
+     *         EnqueuedMessage enqueuedMessage = response.value();
+     *         System.out.printf("Message %s expires at %s", enqueuedMessage.messageId(), enqueuedMessage.expirationTime());
+     *     });
+     *
+ * + * @param messageText Message text + * @param visibilityTimeout Optional. The timeout period for how long the message is invisible in the queue in seconds. + * If unset the value will default to 0 and the message will be instantly visible. The timeout must be between 0 + * seconds and 7 days. + * @param timeToLive Optional. How long the message will stay alive in the queue in seconds. If unset the value will + * default to 7 days, if -1 is passed the message will not expire. The time to live must be -1 or any positive number. + * @return A {@link EnqueuedMessage} value that contains the {@link EnqueuedMessage#messageId() messageId} and + * {@link EnqueuedMessage#popReceipt() popReceipt} that are used to interact with the message and other metadata + * about the enqueued message. + * @throws StorageErrorException If the queue doesn't exist or the {@code visibilityTimeout} or {@code timeToLive} + * are outside of the allowed limits. + */ + public Mono> enqueueMessage(String messageText, Duration visibilityTimeout, Duration timeToLive) { + Integer visibilityTimeoutInSeconds = (visibilityTimeout == null) ? null : (int) visibilityTimeout.getSeconds(); + Integer timeToLiveInSeconds = (timeToLive == null) ? null : (int) timeToLive.getSeconds(); + QueueMessage message = new QueueMessage().messageText(messageText); + + return client.messages().enqueueWithRestResponseAsync(queueName, message, visibilityTimeoutInSeconds, timeToLiveInSeconds, null, null, Context.NONE) + .map(response -> new SimpleResponse<>(response, response.value().get(0))); + } + + /** + * Retrieves the first message in the queue and hides it from other operations for 30 seconds. + * + *

Code Samples

+ * + *

Dequeue a message

+ * + * {@codesnippet com.azure.storage.queue.queueAsyncClient.dequeueMessages} + * + * @return The first {@link DequeuedMessage} in the queue, it contains + * {@link DequeuedMessage#messageId() messageId} and {@link DequeuedMessage#popReceipt() popReceipt} used to interact + * with the message, additionally it contains other metadata about the message. + * @throws StorageErrorException If the queue doesn't exist + */ + public Flux dequeueMessages() { + return dequeueMessages(1, Duration.ofSeconds(30)); + } + + /** + * Retrieves up to the maximum number of messages from the queue and hides them from other operations for 30 seconds. + * + *

Code Samples

+ * + *

Dequeue up to 5 messages

+ * + * 
+     * client.dequeueMessages(5)
+     *     .subscribe(result -> System.out.printf("Dequeued %s and it becomes visible at %s" result.messageId(), result.timeNextVisible()));
+     *
+ * + * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested + * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32 + * messages. + * @return Up to {@code maxMessages} {@link DequeuedMessage DequeuedMessages} from the queue. Each DequeuedMessage contains + * {@link DequeuedMessage#messageId() messageId} and {@link DequeuedMessage#popReceipt() popReceipt} used to interact + * with the message and other metadata about the message. + * @throws StorageErrorException If the queue doesn't exist or {@code maxMessages} is outside of the allowed bounds + */ + public Flux dequeueMessages(Integer maxMessages) { + return dequeueMessages(maxMessages, Duration.ofSeconds(30)); + } -public class QueueAsyncClient extends ServiceClient { - private final String endpoint; - private final AzureQueueStorageImpl generateClient; - private final String apiVersion; + /** + * Retrieves up to the maximum number of messages from the queue and hides them from other operations for the + * timeout period. + * + *

Code Samples

+ * + *

Dequeue up to 5 messages and give them a 60 second timeout period

+ * + * 
+     * client.dequeueMessages(5, Duration.ofSeconds(60))
+     *     .subscribe(result -> System.out.printf("Dequeued %s and it becomes visible at %s" result.messageId(), result.timeNextVisible()));
+     *
+ * + * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested + * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32 + * messages. + * @param visibilityTimeout Optional. The timeout period for how long the message is invisible in the queue in seconds. + * If left empty the dequeued messages will be invisible for 30 seconds. The timeout must be between 1 second and 7 days. + * @return Up to {@code maxMessages} {@link DequeuedMessage DequeuedMessages} from the queue. Each DeqeuedMessage contains + * {@link DequeuedMessage#messageId() messageId} and {@link DequeuedMessage#popReceipt() popReceipt} used to interact + * with the message and other metadata about the message. + * @throws StorageErrorException If the queue doesn't exist or {@code maxMessages} or {@code visibilityTimeout} is + * outside of the allowed bounds + */ + public Flux dequeueMessages(Integer maxMessages, Duration visibilityTimeout) { + Integer visibilityTimeoutInSeconds = (visibilityTimeout == null) ? null : (int) visibilityTimeout.getSeconds(); + return client.messages().dequeueWithRestResponseAsync(queueName, maxMessages, visibilityTimeoutInSeconds, null, null, Context.NONE) + .flatMapMany(response -> Flux.fromIterable(response.value())); + } - private QueueAsyncClient(URL endpoint, HttpPipeline httpPipeline) { - super(httpPipeline); - this.endpoint = endpoint.toString(); - this.generateClient = new AzureQueueStorageBuilder().pipeline(httpPipeline).url(this.endpoint).build(); - this.apiVersion = this.generateClient.version(); + /** + * Peeks the first message in the queue. + * + * Peeked messages don't contain the necessary information needed to interact with the message nor will it hide + * messages from other operations on the queue. + * + *

Code Samples

+ * + *

Peek the first message

+ * + * {@codesnippet com.azure.storage.queue.queueAsyncClient.peekMessages} + * + * @return A {@link PeekedMessage} that contains metadata about the message. + */ + public Flux peekMessages() { + return peekMessages(null); + } + + /** + * Peek messages from the front of the queue up to the maximum number of messages. + * + * Peeked messages don't contain the necessary information needed to interact with the message nor will it hide + * messages from other operations on the queue. + * + *

Code Samples

+ * + *

Peek up to the first five messages

+ * + * 
+     * client.peekMessages(5)
+     *     .subscribe(result -> System.out.printf("Peeked message %s has been dequeued %d times", result.messageId(), result.dequeueCount()));
+     *
+ * + * @param maxMessages Optional. Maximum number of messages to peek, if there are less messages exist in the queue than requested + * all the messages will be peeked. If left empty only 1 message will be peeked, the allowed range is 1 to 32 + * messages. + * @return Up to {@code maxMessages} {@link PeekedMessage PeekedMessages} from the queue. Each PeekedMessage contains + * metadata about the message. + * @throws StorageErrorException If the queue doesn't exist or {@code maxMessages} is outside of the allowed bounds + */ + public Flux peekMessages(Integer maxMessages) { + return client.messages().peekWithRestResponseAsync(queueName, maxMessages, null, null, Context.NONE) + .flatMapMany(response -> Flux.fromIterable(response.value())); } /** - * Creates a appendBlobClientBuilder that can configure options for the SecretAsyncClient before creating an instance of it. - * @return A new appendBlobClientBuilder to create a SecretAsyncClient from. + * Updates the specific message in the queue with a new message and resets the visibility timeout. + * + *

Code Samples

+ * + *

Dequeue the first message and update it to "Hello again, Azure" and hide it for 5 seconds

+ * + * {@codesnippet com.azure.storage.queue.queueAsyncClient.updateMessage} + * + * @param messageText Updated value for the message + * @param messageId Id of the message to update + * @param popReceipt Unique identifier that must match for the message to be updated + * @param visibilityTimeout The timeout period for how long the message is invisible in the queue in seconds. The + * timeout period must be between 1 second and 7 days. + * @return A {@link UpdatedMessage} that contains the new {@link UpdatedMessage#popReceipt() popReceipt} to interact + * with the message, additionally contains the updated metadata about the message. + * @throws StorageErrorException If the queue or messageId don't exist, the popReceipt doesn't match on the message, + * or the {@code visibilityTimeout} is outside the allowed bounds + */ + public Mono> updateMessage(String messageText, String messageId, String popReceipt, Duration visibilityTimeout) { + QueueMessage message = new QueueMessage().messageText(messageText); + return client.messageIds().updateWithRestResponseAsync(queueName, messageId, message, popReceipt, (int) visibilityTimeout.getSeconds(), Context.NONE) + .map(this::getUpdatedMessageResponse); + } + + /** + * Deletes the specified message in the queue + * + *

Code Samples

+ * + *

Delete the first message

+ * + * {@codesnippet com.azure.storage.queue.queueAsyncClient.deleteMessage} + * + * @param messageId Id of the message to deleted + * @param popReceipt Unique identifier that must match for the message to be deleted + * @return A response that only contains headers and response status code + * @throws StorageErrorException If the queue or messageId don't exist or the popReceipt doesn't match on the message + */ + public Mono deleteMessage(String messageId, String popReceipt) { + return client.messageIds().deleteWithRestResponseAsync(queueName, messageId, popReceipt, Context.NONE) + .map(VoidResponse::new); + } + + /* + * Maps the HTTP headers returned from the service to the expected response type + * @param response Service response + * @return Mapped response + */ + private Response getQueuePropertiesResponse(QueuesGetPropertiesResponse response) { + QueueGetPropertiesHeaders propertiesHeaders = response.deserializedHeaders(); + QueueProperties properties = new QueueProperties(propertiesHeaders.metadata(), propertiesHeaders.approximateMessagesCount()); + return new SimpleResponse<>(response, properties); + } + + /* + * Maps the HTTP headers returned from the service to the expected response type + * @param response Service response + * @return Mapped response */ - public static QueueAsyncClientBuilder builder() { - return new QueueAsyncClientBuilder(); + private Response getUpdatedMessageResponse(MessageIdsUpdateResponse response) { + MessageIdUpdateHeaders headers = response.deserializedHeaders(); + UpdatedMessage updatedMessage = new UpdatedMessage(headers.popReceipt(), headers.timeNextVisible()); + return new SimpleResponse<>(response, updatedMessage); } } diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClientBuilder.java deleted file mode 100644 index b76c9c63e8700..0000000000000 --- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClientBuilder.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.azure.storage.queue; - -public class QueueAsyncClientBuilder { - -} diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java new file mode 100644 index 0000000000000..3183335a74735 --- /dev/null +++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java @@ -0,0 +1,439 @@ +// 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.http.rest.VoidResponse; +import com.azure.storage.common.credentials.SASTokenCredential; +import com.azure.storage.common.credentials.SharedKeyCredential; +import com.azure.storage.queue.models.DequeuedMessage; +import com.azure.storage.queue.models.EnqueuedMessage; +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.net.URL; +import java.time.Duration; +import java.util.List; +import java.util.Map; + +/** + * This class provides a client that contains all the operations for interacting with a queue in Azure Storage Queue. + * Operations allowed by the client are creating and deleting the queue, retrieving and updating metadata and access + * policies of the queue, and enqueuing, dequeuing, peeking, updating, and deleting messages. + * + *

Instantiating an Synchronous Queue Client

+ * + * 
+ * QueueClient client = QueueClient.builder()
+ *     .connectionString(connectionString)
+ *     .endpoint(endpoint)
+ *     .queueName(queueName)
+ *     .buildClient();
+ *
+ * + *

View {@link QueueClientBuilder this} for additional ways to construct the client.

+ * + * @see QueueClientBuilder + * @see QueueAsyncClient + * @see SharedKeyCredential + * @see SASTokenCredential + */ +public final class QueueClient { + private final QueueAsyncClient client; + + /** + * Creates a QueueClient that wraps a QueueAsyncClient and blocks requests. + * + * @param client QueueAsyncClient that is used to send requests + */ + QueueClient(QueueAsyncClient client) { + this.client = client; + } + + /** + * @return the URL of the storage queue + */ + public URL getQueueUrl() { + return client.getQueueUrl(); + } + + /** + * Creates a new queue. + * + *

Code Samples

+ * + *

Create a queue

+ * + *{@codesnippet com.azure.storage.queue.queueClient.create} + * + * @return A response that only contains headers and response status code + * @throws StorageErrorException If a queue with the same name already exists in the queue service. + */ + public VoidResponse create() { + return create(null); + } + + /** + * Creates a new queue. + * + *

Code Samples

+ * + *

Create a queue with metadata "queue:metadataMap"

+ * + * 
+     * VoidResponse response = client.create(Collections.singletonMap("queue", "metadataMap"));
+     * System.out.printf("Create completed with status code %d", response.statusCode());
+     *
+ * + * @param metadata Metadata to associate with the queue + * @return A response that only contains headers and response status code + * @throws StorageErrorException If a queue with the same name and different metadata already exists in the queue service. + */ + public VoidResponse create(Map metadata) { + return client.create(metadata).block(); + } + + /** + * Permanently deletes the queue. + * + *

Code Samples

+ * + *

Delete a queue

+ * + * {@codesnippet com.azure.storage.queue.queueClient.delete} + * + * @return A response that only contains headers and response status code + * @throws StorageErrorException If the queue doesn't exist + */ + public VoidResponse delete() { + return client.delete().block(); + } + + /** + * Retrieves metadata and approximate message count of the queue. + * + *

Code Samples

+ * + *

Get the properties of the queue

+ * + * 
+     * QueueProperties properties = client.getProperties().value();
+     * System.out.printf("Metadata: %s, Approximate message count: %d", properties.metadata(), properties.approximateMessagesCount());
+     *
+ * + * @return A response containing a {@link QueueProperties} value which contains the metadata and approximate + * messages count of the queue. + * @throws StorageErrorException If the queue doesn't exist + */ + public Response getProperties() { + return client.getProperties().block(); + } + + /** + * Sets the metadata of the queue. + * + * Passing in a {@code null} value for metadata will clear the metadata associated with the queue. + * + *

Code Samples

+ * + *

Set the queue's metadata to "queue:metadataMap"

+ * + * 
+     * VoidResponse response = client.setMetadata(Collections.singletonMap("queue", "metadataMap"));
+     * System.out.printf("Setting metadata completed with status code %d", response.statusCode());
+     *
+ * + *

Clear the queue's metadata

+ * + * 
+     * VoidResponse response = client.setMetadata(null);
+     * System.out.printf("Clearing metadata completed with status code %d", response.statusCode());
+     *
+ * + * @param metadata Metadata to set on the queue + * @return A response that only contains headers and response status code + * @throws StorageErrorException If the queue doesn't exist + */ + public VoidResponse setMetadata(Map metadata) { + return client.setMetadata(metadata).block(); + } + + /** + * Retrieves stored access policies specified on the queue. + * + *

Code Samples

+ * + *

List the stored access policies

+ * + * 
+     * for (SignedIdentifier permission : client.getAccessPolicy()) {
+     *     System.out.printf("Access policy %s allows these permissions: %s", permission.id(), permission.accessPolicy().permission());
+     * }
+     *
+     * @return The stored access policies specified on the queue.
+     * @throws StorageErrorException If the queue doesn't exist
+     */
+    public Iterable getAccessPolicy() {
+        return client.getAccessPolicy().toIterable();
+    }
+
+    /**
+     * Sets stored access policies on the queue.
+     *
+     * 
Code Samples

+     *
+     * 
Set a read only stored access policy

+     *
+     * 
+     * AccessPolicy policy = new AccessPolicy().permission("r")
+     *     .start(OffsetDateTime.now(ZoneOffset.UTC))
+     *     .expiry(OffsetDateTime.now(ZoneOffset.UTC).addDays(10));
+     *
+     * SignedIdentifier permission = new SignedIdentifier().id("mypolicy").accessPolicy(accessPolicy);
+     *
+     * VoidResponse response = client.setAccessPolicy(Collections.singletonList(permission));
+     * System.out.printf("Setting access policies completed with status code %d", response.statusCode());
+     * 

+     *
+     * @param permissions Access policies to set on the queue
+     * @return A response that only contains headers and response status code
+     * @throws StorageErrorException If the queue doesn't exist, a stored access policy doesn't have all fields filled out,
+     * or the queue will have more than five policies.
+     */
+    public VoidResponse setAccessPolicy(List permissions) {
+        return client.setAccessPolicy(permissions).block();
+    }
+
+    /**
+     * Deletes all messages in the queue.
+     *
+     * 
Code Samples

+     *
+     * 
Clear the messages

+     *
+     * 
+     * VoidResponse response = client.clear();
+     * System.out.printf("Clearing messages completed with status code %d", response.statusCode());
+     * 

+     *
+     * @return A response that only contains headers and response status code
+     * @throws StorageErrorException If the queue doesn't exist
+     */
+    public VoidResponse clearMessages() {
+        return client.clearMessages().block();
+    }
+
+    /**
+     * Enqueues a message that has a time-to-live of 7 days and is instantly visible.
+     *
+     * 
Code Samples

+     *
+     * 
Enqueue a message of "Hello, Azure"

+     *
+     * {@codesnippet com.azure.storage.queue.queueClient.enqueueMessage#string}
+     *
+     * @param messageText Message text
+     * @return A {@link EnqueuedMessage} value that contains the {@link EnqueuedMessage#messageId() messageId} and
+     * {@link EnqueuedMessage#popReceipt() popReceipt} that are used to interact with the message and other metadata
+     * about the enqueued message.
+     * @throws StorageErrorException If the queue doesn't exist
+     */
+    public Response enqueueMessage(String messageText) {
+        return enqueueMessage(messageText, Duration.ofSeconds(0), Duration.ofDays(7));
+    }
+
+    /**
+     * Enqueues a message with a given time-to-live and a timeout period where the message is invisible in the queue.
+     *
+     * 
Code Samples

+     *
+     * 
Add a message of "Hello, Azure" that has a timeout of 5 seconds

+     *
+     * 
+     * EnqueuedMessage enqueuedMessage = client.enqueueMessage("Hello, Azure", Duration.ofSeconds(5), null);
+     * System.out.printf("Message %s becomes visible at %s", enqueuedMessage.messageId(), enqueuedMessage.timeNextVisible());
+     * 

+     *
+     * 
Add a message of "Goodbye, Azure" that has a time to live of 5 seconds

+     *
+     * 
+     * EnqueuedMessage enqueuedMessage = client.enqueueMessage("Goodbye, Azure", null, Duration.ofSeconds(5));
+     * System.out.printf("Message %s expires at %s", enqueuedMessage.messageId(), enqueuedMessage.expirationTime());
+     * 

+     *
+     * @param messageText Message text
+     * @param visibilityTimeout Optional. The timeout period for how long the message is invisible in the queue in seconds.
+     * If unset the value will default to 0 and the message will be instantly visible. The timeout must be between 0
+     * seconds and 7 days.
+     * @param timeToLive Optional. How long the message will stay alive in the queue in seconds. If unset the value will
+     * default to 7 days, if -1 is passed the message will not expire. The time to live must be -1 or any positive number.
+     * @return A {@link EnqueuedMessage} value that contains the {@link EnqueuedMessage#messageId() messageId} and
+     * {@link EnqueuedMessage#popReceipt() popReceipt} that are used to interact with the message and other metadata
+     * about the enqueued message.
+     * @throws StorageErrorException If the queue doesn't exist or the {@code visibilityTimeout} or {@code timeToLive}
+     * are outside of the allowed limits.
+     */
+    public Response enqueueMessage(String messageText, Duration visibilityTimeout, Duration timeToLive) {
+        return client.enqueueMessage(messageText, visibilityTimeout, timeToLive).block();
+    }
+
+    /**
+     * Retrieves the first message in the queue and hides it from other operations for 30 seconds.
+     *
+     * 
Code Samples

+     *
+     * 
Dequeue a message

+     *
+     * {@codesnippet com.azure.storage.queue.queueClient.dequeueMessages}
+     *
+     * @return The first {@link DequeuedMessage} in the queue, it contains
+     * {@link DequeuedMessage#messageId() messageId} and {@link DequeuedMessage#popReceipt() popReceipt} used to interact
+     * with the message, additionally it contains other metadata about the message.
+     * @throws StorageErrorException If the queue doesn't exist
+     */
+    public Iterable dequeueMessages() {
+        return dequeueMessages(1, Duration.ofSeconds(30));
+    }
+
+    /**
+     * Retrieves up to the maximum number of messages from the queue and hides them from other operations for 30 seconds.
+     *
+     * 
Code Samples

+     *
+     * 
Dequeue up to 5 messages

+     *
+     * 
+     * for (DequeuedMessage dequeuedMessage : client.dequeue(5)) {
+     *     System.out.printf("Dequeued %s and it becomes visible at %s", dequeuedMessage.messageId(), dequeuedMessage.timeNextVisible());
+     * }
+     * 

+     *
+     * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested
+     * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32
+     * messages.
+     * @return Up to {@code maxMessages} {@link DequeuedMessage DequeuedMessages} from the queue. Each DequeuedMessage contains
+     * {@link DequeuedMessage#messageId() messageId} and {@link DequeuedMessage#popReceipt() popReceipt} used to interact
+     * with the message and other metadata about the message.
+     * @throws StorageErrorException If the queue doesn't exist or {@code maxMessages} is outside of the allowed bounds
+     */
+    public Iterable dequeueMessages(Integer maxMessages) {
+        return dequeueMessages(maxMessages, Duration.ofSeconds(30));
+    }
+
+    /**
+     * Retrieves up to the maximum number of messages from the queue and hides them from other operations for the
+     * timeout period.
+     *
+     * 
Code Samples

+     *
+     * 
Dequeue up to 5 messages and give them a 60 second timeout period

+     *
+     * 
+     * for (DequeuedMessage dequeuedMessage : client.dequeue(5, Duration.ofSeconds(60))) {
+     *     System.out.printf("Dequeued %s and it becomes visible at %s", dequeuedMessage.messageId(), dequeuedMessage.timeNextVisible());
+     * }
+     * 

+     *
+     * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested
+     * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32
+     * messages.
+     * @param visibilityTimeout Optional. The timeout period for how long the message is invisible in the queue in seconds.
+     * If left empty the dequeued messages will be invisible for 30 seconds. The timeout must be between 1 second and 7 days.
+     * @return Up to {@code maxMessages} {@link DequeuedMessage DequeuedMessages} from the queue. Each DeqeuedMessage contains
+     * {@link DequeuedMessage#messageId() messageId} and {@link DequeuedMessage#popReceipt() popReceipt} used to interact
+     * with the message and other metadata about the message.
+     * @throws StorageErrorException If the queue doesn't exist or {@code maxMessages} or {@code visibilityTimeout} is
+     * outside of the allowed bounds
+     */
+    public Iterable dequeueMessages(Integer maxMessages, Duration visibilityTimeout) {
+        return client.dequeueMessages(maxMessages, visibilityTimeout).toIterable();
+    }
+
+    /**
+     * Peeks the first message in the queue.
+     *
+     * Peeked messages don't contain the necessary information needed to interact with the message nor will it hide
+     * messages from other operations on the queue.
+     *
+     * 
Code Samples

+     *
+     * 
Peek the first message

+     *
+     * {@codesnippet com.azure.storage.queue.queueClient.peekMessages}
+     *
+     * @return A {@link PeekedMessage} that contains metadata about the message.
+     */
+    public Iterable peekMessages() {
+        return peekMessages(null);
+    }
+
+    /**
+     * Peek messages from the front of the queue up to the maximum number of messages.
+     *
+     * Peeked messages don't contain the necessary information needed to interact with the message nor will it hide
+     * messages from other operations on the queue.
+     *
+     * 
Code Samples

+     *
+     * 
Peek up to the first five messages

+     *
+     * 
+     * for (PeekedMessage peekedMessage : client.peekMessages(5)) {
+     *     System.out.printf("Peeked message %s has been dequeued %d times", peekedMessage.messageId(), peekedMessage.dequeueCount());
+     * }
+     * 

+     *
+     * @param maxMessages Optional. Maximum number of messages to peek, if there are less messages exist in the queue than requested
+     * all the messages will be peeked. If left empty only 1 message will be peeked, the allowed range is 1 to 32
+     * messages.
+     * @return Up to {@code maxMessages} {@link PeekedMessage PeekedMessages} from the queue. Each PeekedMessage contains
+     * metadata about the message.
+     * @throws StorageErrorException If the queue doesn't exist or {@code maxMessages} is outside of the allowed bounds
+     */
+    public Iterable peekMessages(Integer maxMessages) {
+        return client.peekMessages(maxMessages).toIterable();
+    }
+
+    /**
+     * Updates the specific message in the queue with a new message and resets the visibility timeout.
+     *
+     * 
Code Samples

+     *
+     * 
Dequeue the first message and update it to "Hello again, Azure" and hide it for 5 seconds

+     *
+     * {@codesnippet com.azure.storage.queue.queueClient.updateMessage}
+     *
+     * @param messageText Updated value for the message
+     * @param messageId Id of the message to update
+     * @param popReceipt Unique identifier that must match for the message to be updated
+     * @param visibilityTimeout The timeout period for how long the message is invisible in the queue in seconds. The
+     * timeout period must be between 1 second and 7 days.
+     * @return A {@link UpdatedMessage} that contains the new {@link UpdatedMessage#popReceipt() popReceipt} to interact
+     * with the message, additionally contains the updated metadata about the message.
+     * @throws StorageErrorException If the queue or messageId don't exist, the popReceipt doesn't match on the message,
+     * or the {@code visibilityTimeout} is outside the allowed bounds
+     */
+    public Response updateMessage(String messageText, String messageId, String popReceipt, Duration visibilityTimeout) {
+        return client.updateMessage(messageText, messageId, popReceipt, visibilityTimeout).block();
+    }
+
+    /**
+     * Deletes the specified message in the queue
+     *
+     * 
Code Samples

+     *
+     * 
Delete the first message

+     *
+     * {@codesnippet com.azure.storage.queue.queueClient.deleteMessage}
+     *
+     * @param messageId Id of the message to deleted
+     * @param popReceipt Unique identifier that must match for the message to be deleted
+     * @return A response that only contains headers and response status code
+     * @throws StorageErrorException If the queue or messageId don't exist or the popReceipt doesn't match on the message
+     */
+    public VoidResponse deleteMessage(String messageId, String popReceipt) {
+        return client.deleteMessage(messageId, popReceipt).block();
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
new file mode 100644
index 0000000000000..f4019a93e3fd1
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -0,0 +1,339 @@
+// 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.HttpPipeline;
+import com.azure.core.http.policy.AddDatePolicy;
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.http.policy.HttpLoggingPolicy;
+import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.http.policy.RequestIdPolicy;
+import com.azure.core.http.policy.RetryPolicy;
+import com.azure.core.http.policy.UserAgentPolicy;
+import com.azure.core.implementation.http.policy.spi.HttpPolicyProviders;
+import com.azure.core.implementation.util.ImplUtils;
+import com.azure.core.util.configuration.Configuration;
+import com.azure.core.util.configuration.ConfigurationManager;
+import com.azure.storage.common.credentials.SASTokenCredential;
+import com.azure.storage.common.credentials.SharedKeyCredential;
+import com.azure.storage.common.policy.SASTokenCredentialPolicy;
+import com.azure.storage.common.policy.SharedKeyCredentialPolicy;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+/**
+ * This class provides a fluent builder API to help aid the configuration and instantiation of the {@link QueueClient QueueClients}
+ * and {@link QueueAsyncClient QueueAsyncClients}, calling {@link QueueClientBuilder#buildClient() buildClient} constructs an
+ * instance of QueueClient and calling {@link QueueClientBuilder#buildAsyncClient() buildAsyncClient} constructs an instance of
+ * QueueAsyncClient.
+ *
+ * 
The client needs the endpoint of the Azure Storage Queue service, name of the queue, and authorization credentials.
+ * {@link QueueClientBuilder#endpoint(String) endpoint} gives the builder the endpoint and may give the builder the
+ * {@link QueueClientBuilder#queueName(String) queueName} and a {@link SASTokenCredential} that authorizes the client.

+ *
+ * 
Instantiating a synchronous Queue Service Client with SAS token

+ * {@codesnippet com.azure.storage.queue.queueClient.instantiation.sastoken}
+ *
+ * 
Instantiating an Asynchronous Queue Service Client with SAS token

+ * {@codesnippet com.azure.storage.queue.queueAsyncClient.instantiation.sastoken}
+ *
+ * 
If the {@code endpoint} doesn't contain the queue name or {@code SASTokenCredential} they may be set using
+ * {@link QueueClientBuilder#queueName(String) queueName} and {@link QueueClientBuilder#credential(SASTokenCredential) credential}.

+ *
+ * 
+ * QueueClient client = QueueClient.builder()
+ *     .endpoint(endpointWithoutQueueNameOrSASTokenQueryParams)
+ *     .queueName(queueName)
+ *     .credential(SASTokenCredential.fromQuery(SASTokenQueryParams))
+ *     .buildClient();
+ * 

+ *
+ * 
+ * QueueAsyncClient client = QueueAsyncClient.builder()
+ *     .endpoint(endpointWithoutQueueNameOrSASTokenQueryParams)
+ *     .queueName(queueName)
+ *     .credential(SASTokenCredential.fromQuery(SASTokenQueryParams))
+ *     .buildAsyncClient();
+ * 

+ *
+ * 
Another way to authenticate the client is using a {@link SharedKeyCredential}. To create a SharedKeyCredential
+ * a connection string from the Storage Queue service must be used. Set the SharedKeyCredential with
+ * {@link QueueClientBuilder#connectionString(String) connectionString}. If the builder has both a SASTokenCredential and
+ * SharedKeyCredential the SharedKeyCredential will be preferred when authorizing requests sent to the service.

+ *
+ * 
Instantiating a synchronous Queue Client with connection string.

+ * {@codesnippet com.azure.storage.queue.queueClient.instantiation.connectionstring}
+ *
+ * 
Instantiating an Asynchronous Queue Client with connection string.

+ * {@codesnippet com.azure.storage.queue.queueAsyncClient.instantiation.connectionstring}
+ *
+ * @see QueueClient
+ * @see QueueAsyncClient
+ * @see SASTokenCredential
+ * @see SharedKeyCredential
+ */
+public final class QueueClientBuilder {
+    private static final String ACCOUNT_NAME = "accountname";
+    private final List policies;
+
+    private URL endpoint;
+    private String queueName;
+    private SASTokenCredential sasTokenCredential;
+    private SharedKeyCredential sharedKeyCredential;
+    private HttpClient httpClient;
+    private HttpPipeline pipeline;
+    private HttpLogDetailLevel logLevel;
+    private RetryPolicy retryPolicy;
+    private Configuration configuration;
+
+    /**
+     * Creates a builder instance that is able to configure and construct {@link QueueClient QueueClients}
+     * and {@link QueueAsyncClient QueueAsyncClients}.
+     */
+    public QueueClientBuilder() {
+        retryPolicy = new RetryPolicy();
+        logLevel = HttpLogDetailLevel.NONE;
+        policies = new ArrayList<>();
+
+        configuration = ConfigurationManager.getConfiguration();
+    }
+
+    /**
+     * Creates a {@link QueueClient} based on options set in the builder. Every time {@code buildClient()} is
+     * called a new instance of {@link QueueClient} is created.
+     *
+     * 

+     * If {@link QueueClientBuilder#pipeline(HttpPipeline) pipeline} is set, then the {@code pipeline},
+     * {@link QueueClientBuilder#endpoint(String) endpoint}, and
+     * {@link QueueClientBuilder#queueName(String) queueName} are used to create the {@link QueueAsyncClient client}.
+     * All other builder settings are ignored.
+     * 

+     *
+     * @return A QueueClient with the options set from the builder.
+     * @throws NullPointerException If {@code endpoint} or {@code queueName} have not been set.
+     * @throws IllegalStateException If neither a {@link SharedKeyCredential} or {@link SASTokenCredential} has been set.
+     */
+    public QueueClient buildClient() {
+        return new QueueClient(buildAsyncClient());
+    }
+
+    /**
+     * Creates a {@link QueueAsyncClient} based on options set in the builder. Every time {@code buildAsyncClient()} is
+     * called a new instance of {@link QueueAsyncClient} is created.
+     *
+     * 

+     * If {@link QueueClientBuilder#pipeline(HttpPipeline) pipeline} is set, then the {@code pipeline},
+     * {@link QueueClientBuilder#endpoint(String) endpoint}, and
+     * {@link QueueClientBuilder#queueName(String) queueName} are used to create the {@link QueueAsyncClient client}.
+     * All other builder settings are ignored.
+     * 

+     *
+     * @return A QueueAsyncClient with the options set from the builder.
+     * @throws NullPointerException If {@code endpoint} or {@code queueName} have not been set.
+     * @throws IllegalArgumentException If neither a {@link SharedKeyCredential} or {@link SASTokenCredential} has been set.
+     */
+    public QueueAsyncClient buildAsyncClient() {
+        Objects.requireNonNull(endpoint);
+        Objects.requireNonNull(queueName);
+
+        if (pipeline != null) {
+            return new QueueAsyncClient(endpoint, pipeline, queueName);
+        }
+
+        if (sasTokenCredential == null && sharedKeyCredential == null) {
+            throw new IllegalArgumentException("Credentials are required for authorization");
+        }
+
+        // Closest to API goes first, closest to wire goes last.
+        final List policies = new ArrayList<>();
+
+        policies.add(new UserAgentPolicy(QueueConfiguration.NAME, QueueConfiguration.VERSION, configuration));
+        policies.add(new RequestIdPolicy());
+        policies.add(new AddDatePolicy());
+
+        if (sharedKeyCredential != null) {
+            policies.add(new SharedKeyCredentialPolicy(sharedKeyCredential));
+        } else {
+            policies.add(new SASTokenCredentialPolicy(sasTokenCredential));
+        }
+
+        HttpPolicyProviders.addBeforeRetryPolicies(policies);
+
+        policies.add(retryPolicy);
+
+        policies.addAll(this.policies);
+        HttpPolicyProviders.addAfterRetryPolicies(policies);
+        policies.add(new HttpLoggingPolicy(logLevel));
+
+        HttpPipeline pipeline = HttpPipeline.builder()
+            .policies(policies.toArray(new HttpPipelinePolicy[0]))
+            .httpClient(httpClient)
+            .build();
+
+        return new QueueAsyncClient(endpoint, pipeline, queueName);
+    }
+
+    /**
+     * Sets the endpoint for the Azure Storage Queue instance that the client will interact with.
+     *
+     * 
The first path segment, if the endpoint contains path segments, will be assumed to be the name of the queue
+     * that the client will interact with.

+     *
+     * 
Query parameters of the endpoint will be parsed using {@link SASTokenCredential#fromQuery(String) fromQuery} in an
+     * attempt to generate a {@link SASTokenCredential} to authenticate requests sent to the service.

+     *
+     * @param endpoint The URL of the Azure Storage Queue instance to send service requests to and receive responses from.
+     * @return the updated QueueClientBuilder object
+     * @throws IllegalArgumentException If {@code endpoint} isn't a proper URL
+     */
+    public QueueClientBuilder endpoint(String endpoint) {
+        Objects.requireNonNull(endpoint);
+        try {
+            URL fullURL = new URL(endpoint);
+            this.endpoint = new URL(fullURL.getProtocol() + "://" + fullURL.getHost());
+
+            // Attempt to get the queue name from the URL passed
+            String[] pathSegments = fullURL.getPath().split("/", 2);
+            if (pathSegments.length == 2 && !ImplUtils.isNullOrEmpty(pathSegments[1])) {
+                this.queueName = pathSegments[1];
+            }
+
+            // Attempt to get the SAS token from the URL passed
+            SASTokenCredential credential = SASTokenCredential.fromQuery(fullURL.getQuery());
+            if (credential != null) {
+                this.sasTokenCredential = credential;
+            }
+        } catch (MalformedURLException ex) {
+            throw new IllegalArgumentException("The Azure Storage Queue endpoint url is malformed.");
+        }
+
+        return this;
+    }
+
+    /**
+     * Sets the name of the queue that the client will interact with.
+     *
+     * @param queueName Name of the queue
+     * @return the updated QueueClientBuilder object
+     * @throws NullPointerException If {@code queueName} is {@code null}.
+     */
+    public QueueClientBuilder queueName(String queueName) {
+        this.queueName = Objects.requireNonNull(queueName);
+        return this;
+    }
+
+    /**
+     * Sets the {@link SASTokenCredential} used to authenticate requests sent to the Queue service.
+     *
+     * @param credential SAS token credential generated from the Storage account that authorizes requests
+     * @return the updated QueueClientBuilder object
+     * @throws NullPointerException If {@code credential} is {@code null}.
+     */
+    public QueueClientBuilder credential(SASTokenCredential credential) {
+        this.sasTokenCredential = Objects.requireNonNull(credential);
+        return this;
+    }
+
+    /**
+     * Creates a {@link SharedKeyCredential} from the {@code connectionString} used to authenticate requests sent to the
+     * Queue service.
+     *
+     * @param connectionString Connection string from the Access Keys section in the Storage account
+     * @return the updated QueueClientBuilder object
+     * @throws NullPointerException If {@code connectionString} is {@code null}.
+     */
+    public QueueClientBuilder connectionString(String connectionString) {
+        Objects.requireNonNull(connectionString);
+        this.sharedKeyCredential = SharedKeyCredential.fromConnectionString(connectionString);
+        Objects.requireNonNull(connectionString);
+        this.sharedKeyCredential = SharedKeyCredential.fromConnectionString(connectionString);
+        getEndPointFromConnectionString(connectionString);
+        return this;
+    }
+
+    private void getEndPointFromConnectionString(String connectionString) {
+        HashMap connectionStringPieces = new HashMap<>();
+        for (String connectionStringPiece : connectionString.split(";")) {
+            String[] kvp = connectionStringPiece.split("=", 2);
+            connectionStringPieces.put(kvp[0].toLowerCase(Locale.ROOT), kvp[1]);
+        }
+        String accountName = connectionStringPieces.get(ACCOUNT_NAME);
+        try {
+            this.endpoint = new URL(String.format("https://%s.queue.core.windows.net", accountName));
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException(String.format("There is no valid account for the connection string. "
+                                                                 + "Connection String: %s", connectionString));
+        }
+    }
+    /**
+     * Sets the HTTP client to use for sending and receiving requests to and from the service.
+     *
+     * @param httpClient The HTTP client to use for requests.
+     * @return The updated QueueClientBuilder object.
+     * @throws NullPointerException If {@code httpClient} is {@code null}.
+     */
+    public QueueClientBuilder httpClient(HttpClient httpClient) {
+        this.httpClient = Objects.requireNonNull(httpClient);
+        return this;
+    }
+
+    /**
+     * Adds a policy to the set of existing policies that are executed after the {@link RetryPolicy}.
+     *
+     * @param pipelinePolicy The retry policy for service requests.
+     * @return The updated QueueClientBuilder object.
+     * @throws NullPointerException If {@code pipelinePolicy} is {@code null}.
+     */
+    public QueueClientBuilder addPolicy(HttpPipelinePolicy pipelinePolicy) {
+        Objects.requireNonNull(pipelinePolicy);
+        this.policies.add(pipelinePolicy);
+        return this;
+    }
+
+    /**
+     * Sets the logging level for HTTP requests and responses.
+     *
+     * @param logLevel The amount of logging output when sending and receiving HTTP requests/responses.
+     * @return The updated QueueClientBuilder object.
+     */
+    public QueueClientBuilder httpLogDetailLevel(HttpLogDetailLevel logLevel) {
+        this.logLevel = logLevel;
+        return this;
+    }
+
+    /**
+     * Sets the HTTP pipeline to use for the service client.
+     *
+     * If {@code pipeline} is set, all other settings are ignored, aside from {@link QueueClientBuilder#endpoint(String) endpoint}
+     * and {@link QueueClientBuilder#queueName(String) queueName} when building clients.
+     *
+     * @param pipeline The HTTP pipeline to use for sending service requests and receiving responses.
+     * @return The updated QueueClientBuilder object.
+     * @throws NullPointerException If {@code pipeline} is {@code null}.
+     */
+    public QueueClientBuilder pipeline(HttpPipeline pipeline) {
+        Objects.requireNonNull(pipeline);
+        this.pipeline = pipeline;
+        return this;
+    }
+
+    /**
+     * Sets the configuration store that is used during construction of the service client.
+     *
+     * The default configuration store is a clone of the {@link ConfigurationManager#getConfiguration() global
+     * configuration store}, use {@link Configuration#NONE} to bypass using configuration settings during construction.
+     *
+     * @param configuration The configuration store used to
+     * @return The updated QueueClientBuilder object.
+     */
+    public QueueClientBuilder configuration(Configuration configuration) {
+        this.configuration = configuration;
+        return this;
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java
new file mode 100644
index 0000000000000..1de39c548c262
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.storage.queue;
+
+/*
+ * Gets the SDK information for this library component.
+ */
+class QueueConfiguration {
+    //TODO: Eventually remove these hardcoded strings with https://github.com/Azure/azure-sdk-for-java/issues/3141
+    static final String NAME = "storage-queue";
+    static final String VERSION = "1.0.0-SNAPSHOT";
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
new file mode 100644
index 0000000000000..e4b13b10cef54
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
@@ -0,0 +1,342 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.storage.queue;
+
+import com.azure.core.http.HttpPipeline;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.http.rest.VoidResponse;
+import com.azure.core.util.Context;
+import com.azure.storage.common.credentials.SASTokenCredential;
+import com.azure.storage.common.credentials.SharedKeyCredential;
+import com.azure.storage.queue.implementation.AzureQueueStorageBuilder;
+import com.azure.storage.queue.implementation.AzureQueueStorageImpl;
+import com.azure.storage.queue.models.CorsRule;
+import com.azure.storage.queue.models.ListQueuesIncludeType;
+import com.azure.storage.queue.models.ListQueuesSegmentResponse;
+import com.azure.storage.queue.models.QueueItem;
+import com.azure.storage.queue.models.QueuesSegmentOptions;
+import com.azure.storage.queue.models.ServicesListQueuesSegmentResponse;
+import com.azure.storage.queue.models.StorageErrorException;
+import com.azure.storage.queue.models.StorageServiceProperties;
+import com.azure.storage.queue.models.StorageServiceStats;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * This class provides a client that contains all the operations for interacting with a queue account in Azure Storage.
+ * Operations allowed by the client are creating, listing, and deleting queues, retrieving and updating properties of the account,
+ * and retrieving statistics of the account.
+ *
+ * 
Instantiating an Asynchronous Queue Service Client

+ *
+ * 
+ * QueueServiceAsyncClient client = QueueServiceAsyncClient.builder()
+ *     .connectionString(connectionString)
+ *     .endpoint(endpoint)
+ *     .buildAsyncClient();
+ * 

+ *
+ * 
View {@link QueueServiceClientBuilder this} for additional ways to construct the client.

+ *
+ * @see QueueServiceClientBuilder
+ * @see QueueServiceClient
+ * @see SharedKeyCredential
+ * @see SASTokenCredential
+ */
+public final class QueueServiceAsyncClient {
+    private final AzureQueueStorageImpl client;
+
+    /**
+     * Creates a QueueServiceAsyncClient that sends requests to the storage account at {@code endpoint}.
+     * Each service call goes through the {@code httpPipeline}.
+     *
+     * @param endpoint URL for the Storage Queue service
+     * @param httpPipeline HttpPipeline that the HTTP requests and response flow through
+     */
+    QueueServiceAsyncClient(URL endpoint, HttpPipeline httpPipeline) {
+        this.client = new AzureQueueStorageBuilder().pipeline(httpPipeline)
+            .url(endpoint.toString())
+            .build();
+    }
+
+    /**
+     * @return the URL of the storage queue
+     * @throws RuntimeException If the queue service is using a malformed URL.
+     */
+    public URL getQueueServiceUrl() {
+        try {
+            return new URL(client.url());
+        } catch (MalformedURLException ex) {
+            throw new RuntimeException("Storage account URL is malformed");
+        }
+    }
+
+    /**
+     * Constructs a QueueAsyncClient that interacts with the specified queue.
+     *
+     * This will not create the queue in the storage account if it doesn't exist.
+     *
+     * @param queueName Name of the queue
+     * @return QueueAsyncClient that interacts with the specified queue
+     */
+    public QueueAsyncClient getQueueAsyncClient(String queueName) {
+        return new QueueAsyncClient(client, queueName);
+    }
+
+    /**
+     * Creates a queue in the storage account with the specified name and returns a QueueAsyncClient to interact
+     * with it.
+     *
+     * 
Code Samples

+     *
+     * 
Create the queue "test"

+     *
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.createQueue#string}
+     *
+     * @param queueName Name of the queue
+     * @return A response containing the QueueAsyncClient and the status of creating the queue
+     * @throws StorageErrorException If a queue with the same name and different metadata already exists
+     */
+    public Mono> createQueue(String queueName) {
+        return createQueue(queueName, null);
+    }
+
+    /**
+     * Creates a queue in the storage account with the specified name and metadata and returns a QueueAsyncClient to
+     * interact with it.
+     *
+     * 
Code Samples

+     *
+     * 
Create the queue "test" with metadata "queue:metadata"

+     *
+     * 
+     * client.createQueue("test", Collections.singletonMap("queue", "metadata"))
+     *     .subscribe(response -> System.out.printf("Creating the queue completed with status code %d", response.statusCode()));
+     * 

+     *
+     * @param queueName Name of the queue
+     * @param metadata Metadata to associate with the queue
+     * @return A response containing the QueueAsyncClient and the status of creating the queue
+     * @throws StorageErrorException If a queue with the same name and different metadata already exists
+     */
+    public Mono> createQueue(String queueName, Map metadata) {
+        QueueAsyncClient queueAsyncClient = new QueueAsyncClient(client, queueName);
+
+        return queueAsyncClient.create(metadata)
+            .map(response -> new SimpleResponse<>(response, queueAsyncClient));
+    }
+
+    /**
+     * Deletes a queue in the storage account
+     *
+     * 
Code Samples

+     *
+     * 
Delete the queue "test"

+     *
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.deleteQueue#string}
+     *
+     * @param queueName Name of the queue
+     * @return A response that only contains headers and response status code
+     * @throws StorageErrorException If the queue doesn't exist
+     */
+    public Mono deleteQueue(String queueName) {
+        return new QueueAsyncClient(client, queueName).delete();
+    }
+
+    /**
+     * Lists all queues in the storage account without their metadata.
+     *
+     * 
Code Samples

+     *
+     * 
List all queues in the account

+     *
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.listQueues}
+     *
+     * @return {@link QueueItem Queues} in the storage account
+     */
+    public Flux listQueues() {
+        return listQueues(null, null);
+    }
+
+    /**
+     * Lists the queues in the storage account that pass the filter.
+     *
+     * Pass true to {@link QueuesSegmentOptions#includeMetadata(boolean) includeMetadata} to have metadata returned for
+     * the queues.
+     *
+     * 
Code Samples

+     *
+     * 
List all queues and their metadata in the account

+     *
+     * 
+     * client.listQueues(new QueuesSegmentOptions().includeMetadata(true))
+     *     .subscribe(result -> System.out.printf("Queue %s exists in the account and has metadata %s", result.name(), result.metadata()));
+     * 

+     *
+     * 
List all queues that begin with "azure"

+     *
+     * 
+     * client.listQueues(new QueuesSegmentOptions().prefix("azure"))
+     *     .subscribe(result -> System.out.printf("Queue %s exists in the account", result.name()));
+     * 

+     *
+     * @param options Options for listing queues
+     * @return {@link QueueItem Queues} in the storage account that satisfy the filter requirements
+     */
+    public Flux listQueues(QueuesSegmentOptions options) {
+        return listQueues(null, options);
+    }
+
+    /**
+     * Lists the queues in the storage account that pass the filter starting at the specified marker.
+     *
+     * Pass true to {@link QueuesSegmentOptions#includeMetadata(boolean) includeMetadata} to have metadata returned for
+     * the queues.
+     *
+     * @param marker Starting point to list the queues
+     * @param options Options for listing queues
+     * @return {@link QueueItem Queues} in the storage account that satisfy the filter requirements
+     */
+    Flux listQueues(String marker, QueuesSegmentOptions options) {
+        String prefix = null;
+        Integer maxResults = null;
+        final List include = new ArrayList<>();
+
+        if (options != null) {
+            prefix = options.prefix();
+            maxResults = options.maxResults();
+            if (options.includeMetadata()) {
+                include.add(ListQueuesIncludeType.fromString(ListQueuesIncludeType.METADATA.toString()));
+            }
+        }
+
+        Mono result = client.services()
+            .listQueuesSegmentWithRestResponseAsync(prefix, marker, maxResults, include, null, null, Context.NONE);
+
+        return result.flatMapMany(response -> extractAndFetchQueues(response, include, Context.NONE));
+    }
+
+    /*
+     * Helper function used to auto-enumerate through paged responses
+     */
+    private Flux listQueues(ServicesListQueuesSegmentResponse response, List include, Context context) {
+        ListQueuesSegmentResponse value = response.value();
+        Mono result = client.services()
+            .listQueuesSegmentWithRestResponseAsync(value.prefix(), value.marker(), value.maxResults(), include, null, null, context);
+
+        return result.flatMapMany(r -> extractAndFetchQueues(r, include, context));
+    }
+
+    /*
+     * Helper function used to auto-enumerate though paged responses
+     */
+    private Publisher extractAndFetchQueues(ServicesListQueuesSegmentResponse response, List include, Context context) {
+        String nextPageLink = response.value().nextMarker();
+        if (nextPageLink == null) {
+            return Flux.fromIterable(response.value().queueItems());
+        }
+
+        return Flux.fromIterable(response.value().queueItems()).concatWith(listQueues(response, include, context));
+    }
+
+    /**
+     * Retrieves the properties of the storage account's Queue service. The properties range from storage analytics and
+     * metric to CORS (Cross-Origin Resource Sharing).
+     *
+     * 
Code Samples

+     *
+     * 
Retrieve Queue service properties

+     *
+     * 
+     * client.getProperties()
+     *     .subscribe(response -> {
+     *         StorageServiceProperties properties = response.value();
+     *         System.out.printf("Hour metrics enabled: %b, Minute metrics enabled: %b", properties.hourMetrics().enabled(), properties.minuteMetrics().enabled());
+     *     });
+     * 

+     *
+     * @return Storage account Queue service properties
+     */
+    public Mono> getProperties() {
+        return client.services().getPropertiesWithRestResponseAsync(Context.NONE)
+            .map(response -> new SimpleResponse<>(response, response.value()));
+    }
+
+    /**
+     * Sets the properties for the storage account's Queue service. The properties range from storage analytics and
+     * metric to CORS (Cross-Origin Resource Sharing).
+     *
+     * To maintain the CORS in the Queue service pass a {@code null} value for {@link StorageServiceProperties#cors() CORS}.
+     * To disable all CORS in the Queue service pass an empty list for {@link StorageServiceProperties#cors() CORS}.
+     *
+     * 
Code Sample

+     *
+     * 
Clear CORS in the Queue service

+     *
+     * 
+     * StorageServiceProperties properties = client.getProperties().block().value();
+     * properties.cors(Collections.emptyList());
+     *
+     * client.setProperties(properties)
+     *     .subscribe(response -> System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode()));
+     * 

+     *
+     * 
Enable Minute and Hour Metrics

+     *
+     * 
+     * StorageServiceProperties properties = client.getProperties().block().value();
+     * properties.minuteMetrics().enabled(true);
+     * properties.hourMetrics().enabled(true);
+     *
+     * client.setProperties(properties)
+     *     .subscribe(response -> System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode()));
+     * 

+     *
+     * @param properties Storage account Queue service properties
+     * @return A response that only contains headers and response status code
+     * @throws StorageErrorException When one of the following is true
+     * 
    
+     *     
  • A CORS rule is missing one of its fields
    • 
+     *     
  • More than five CORS rules will exist for the Queue service
    • 
+     *     
  • Size of all CORS rules exceeds 2KB
    • 
+     *     
  • 
+     *         Length of {@link CorsRule#allowedHeaders() allowed headers}, {@link CorsRule#exposedHeaders() exposed headers},
+     *         or {@link CorsRule#allowedOrigins() allowed origins} exceeds 256 characters.
+     *     
    • 
+     *     
  • {@link CorsRule#allowedMethods() Allowed methods} isn't DELETE, GET, HEAD, MERGE, POST, OPTIONS, or PUT
    • 
+     * 

+     */
+    public Mono setProperties(StorageServiceProperties properties) {
+        return client.services().setPropertiesWithRestResponseAsync(properties, Context.NONE)
+            .map(VoidResponse::new);
+    }
+
+    /**
+     * Retrieves the geo replication information about the Queue service.
+     *
+     * 
Code Samples

+     *
+     * 
Retrieve the geo replication information

+     *
+     * 
+     * client.getStatistics()
+     *     .subscribe(response -> {
+     *         StorageServiceStats stats = response.value();
+     *         System.out.printf("Geo replication status: %s, Last synced: %s", stats.geoReplication.status(), stats.geoReplication().lastSyncTime());
+     *     });
+     * 

+     *
+     * @return The geo replication information about the Queue service
+     */
+    public Mono> getStatistics() {
+        return client.services().getStatisticsWithRestResponseAsync(Context.NONE)
+            .map(response -> new SimpleResponse<>(response, response.value()));
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
new file mode 100644
index 0000000000000..0bebaaf2039cf
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
@@ -0,0 +1,273 @@
+// 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.http.rest.SimpleResponse;
+import com.azure.core.http.rest.VoidResponse;
+import com.azure.storage.common.credentials.SASTokenCredential;
+import com.azure.storage.common.credentials.SharedKeyCredential;
+import com.azure.storage.queue.models.CorsRule;
+import com.azure.storage.queue.models.QueueItem;
+import com.azure.storage.queue.models.QueuesSegmentOptions;
+import com.azure.storage.queue.models.StorageErrorException;
+import com.azure.storage.queue.models.StorageServiceProperties;
+import com.azure.storage.queue.models.StorageServiceStats;
+import java.net.URL;
+import java.util.Map;
+
+/**
+ * This class provides a client that contains all the operations for interacting with a queue account in Azure Storage.
+ * Operations allowed by the client are creating, listing, and deleting queues, retrieving and updating properties of the account,
+ * and retrieving statistics of the account.
+ *
+ * 
Instantiating an Synchronous Queue Service Client

+ *
+ * 
+ * QueueServiceClient client = QueueServiceClient.builder()
+ *     .connectionString(connectionString)
+ *     .endpoint(endpoint)
+ *     .buildClient();
+ * 

+ *
+ * 
View {@link QueueServiceClientBuilder this} for additional ways to construct the client.

+ *
+ * @see QueueServiceClientBuilder
+ * @see QueueServiceAsyncClient
+ * @see SharedKeyCredential
+ * @see SASTokenCredential
+ */
+public final class QueueServiceClient {
+    private final QueueServiceAsyncClient client;
+
+    /**
+     * Creates a QueueServiceClient that wraps a QueueServiceAsyncClient and blocks requests.
+     *
+     * @param client QueueServiceAsyncClient that is used to send requests
+     */
+    QueueServiceClient(QueueServiceAsyncClient client) {
+        this.client = client;
+    }
+
+    /**
+     * @return the URL of the storage queue
+     */
+    public URL getQueueServiceUrl() {
+        return client.getQueueServiceUrl();
+    }
+
+    /**
+     * Constructs a QueueClient that interacts with the specified queue.
+     *
+     * This will not create the queue in the storage account if it doesn't exist.
+     *
+     * @param queueName Name of the queue
+     * @return QueueClient that interacts with the specified queue
+     */
+    public QueueClient getQueueClient(String queueName) {
+        return new QueueClient(client.getQueueAsyncClient(queueName));
+    }
+
+    /**
+     * Creates a queue in the storage account with the specified name and returns a QueueClient to interact with it.
+     *
+     * 
Code Samples

+     *
+     * 
Create the queue "test"

+     *
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.createQueue#string}
+     *
+     * @param queueName Name of the queue
+     * @return A response containing the QueueClient and the status of creating the queue
+     * @throws StorageErrorException If a queue with the same name and different metadata already exists
+     */
+    public Response createQueue(String queueName) {
+        return createQueue(queueName, null);
+    }
+
+    /**
+     * Creates a queue in the storage account with the specified name and metadata and returns a QueueClient to
+     * interact with it.
+     *
+     * 
Code Samples

+     *
+     * 
Create the queue "test" with metadata "queue:metadata"

+     *
+     * 
+     * Response<QueueClient> = client.createQueue("test", Collections.singletonMap("queue", "metadata"));
+     * System.out.printf("Creating the queue completed with status code %d", response.statusCode());
+     * 

+     *
+     * @param queueName Name of the queue
+     * @param metadata Metadata to associate with the queue
+     * @return A response containing the QueueClient and the status of creating the queue
+     * @throws StorageErrorException If a queue with the same name and different metadata already exists
+     */
+    public Response createQueue(String queueName, Map metadata) {
+        Response response = client.createQueue(queueName, metadata).block();
+
+        return new SimpleResponse<>(response, new QueueClient(response.value()));
+    }
+
+    /**
+     * Deletes a queue in the storage account
+     *
+     * 
Code Samples

+     *
+     * 
Delete the queue "test"

+     *
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.deleteQueue#string}
+     *
+     * @param queueName Name of the queue
+     * @return A response containing the status of deleting the queue
+     * @throws StorageErrorException If the queue doesn't exist
+     */
+    public VoidResponse deleteQueue(String queueName) {
+        return client.deleteQueue(queueName).block();
+    }
+
+    /**
+     * Lists all queues in the storage account without their metadata.
+     *
+     * 
Code Samples

+     *
+     * 
List all queues in the account

+     *
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.listQueues}
+     *
+     * @return {@link QueueItem Queues} in the storage account
+     */
+    public Iterable listQueues() {
+        return listQueues(null, null);
+    }
+
+    /**
+     * Lists the queues in the storage account that pass the filter.
+     *
+     * Pass true to {@link QueuesSegmentOptions#includeMetadata(boolean) includeMetadata} to have metadata returned for
+     * the queues.
+     *
+     * 
Code Samples

+     *
+     * 
List all queues and their metadata in the account

+     *
+     * 
+     * for (QueueItem queue : client.listQueues(new QueuesSegmentOptions().includeMetadata(true))) {
+     *     System.out.printf("Queue %s exists in the account and has metadata %s", queue.name(), queue.metadata());
+     * }
+     * 

+     *
+     * 
List all queues that begin with "azure"

+     *
+     * 
+     * for (QueueItem queue : client.listQueues(new QueuesSegmentOptions().prefix("azure"))) {
+     *     System.out.printf("Queue %s exists in the account", queue.name());
+     * }
+     * 

+     *
+     * @param options Options for listing queues
+     * @return {@link QueueItem Queues} in the storage account that satisfy the filter requirements
+     */
+    public Iterable listQueues(QueuesSegmentOptions options) {
+        return listQueues(null, options);
+    }
+
+    /**
+     * Lists the queues in the storage account that pass the filter starting at the specified marker.
+     *
+     * Pass true to {@link QueuesSegmentOptions#includeMetadata(boolean) includeMetadata} to have metadata returned for
+     * the queues.
+     *
+     * @param marker Starting point to list the queues
+     * @param options Options for listing queues
+     * @return {@link QueueItem Queues} in the storage account that satisfy the filter requirements
+     */
+    Iterable listQueues(String marker, QueuesSegmentOptions options) {
+        return client.listQueues(marker, options).toIterable();
+    }
+
+    /**
+     * Retrieves the properties of the storage account's Queue service. The properties range from storage analytics and
+     * metric to CORS (Cross-Origin Resource Sharing).
+     *
+     * 
Code Samples

+     *
+     * 
Retrieve Queue service properties

+     *
+     * 
+     * StorageServiceProperties properties = client.getProperties().value();
+     * System.out.printf("Hour metrics enabled: %b, Minute metrics enabled: %b", properties.hourMetrics().enabled(), properties.minuteMetrics().enabled());
+     * 

+     *
+     * @return Storage account Queue service properties
+     */
+    public Response getProperties() {
+        return client.getProperties().block();
+    }
+
+    /**
+     * Sets the properties for the storage account's Queue service. The properties range from storage analytics and
+     * metric to CORS (Cross-Origin Resource Sharing).
+     *
+     * To maintain the CORS in the Queue service pass a {@code null} value for {@link StorageServiceProperties#cors() CORS}.
+     * To disable all CORS in the Queue service pass an empty list for {@link StorageServiceProperties#cors() CORS}.
+     *
+     * 
Code Sample

+     *
+     * 
Clear CORS in the Queue service

+     *
+     * 
+     * StorageServiceProperties properties = client.getProperties().value();
+     * properties.cors(Collections.emptyList());
+     *
+     * VoidResponse response = client.setProperties(properties);
+     * System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode());
+     * 

+     *
+     * 
Enable Minute and Hour Metrics

+     *
+     * 
+     * StorageServiceProperties properties = client.getProperties().value();
+     * properties.minuteMetrics().enabled(true);
+     * properties.hourMetrics().enabled(true);
+     *
+     * VoidResponse response = client.setProperties(properties);
+     * System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode());
+     * 

+     *
+     * @param properties Storage account Queue service properties
+     * @return A response that only contains headers and response status code
+     * @throws StorageErrorException When one of the following is true
+     * 
    
+     *     
  • A CORS rule is missing one of its fields
    • 
+     *     
  • More than five CORS rules will exist for the Queue service
    • 
+     *     
  • Size of all CORS rules exceeds 2KB
    • 
+     *     
  • 
+     *         Length of {@link CorsRule#allowedHeaders() allowed headers}, {@link CorsRule#exposedHeaders() exposed headers},
+     *         or {@link CorsRule#allowedOrigins() allowed origins} exceeds 256 characters.
+     *     
    • 
+     *     
  • {@link CorsRule#allowedMethods() Allowed methods} isn't DELETE, GET, HEAD, MERGE, POST, OPTIONS, or PUT
    • 
+     * 

+     */
+    public VoidResponse setProperties(StorageServiceProperties properties) {
+        return client.setProperties(properties).block();
+    }
+
+    /**
+     * Retrieves the geo replication information about the Queue service.
+     *
+     * 
Code Samples

+     *
+     * 
Retrieve the geo replication information

+     *
+     * 
+     * StorageServiceStats stats = client.getStatistics().value();
+     * System.out.printf("Geo replication status: %s, Last synced: %s", stats.geoReplication.status(), stats.geoReplication().lastSyncTime());
+     * 

+     *
+     * @return The geo replication information about the Queue service
+     */
+    public Response getStatistics() {
+        return client.getStatistics().block();
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
new file mode 100644
index 0000000000000..11da084cb1194
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
@@ -0,0 +1,289 @@
+// 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.HttpPipeline;
+import com.azure.core.http.policy.AddDatePolicy;
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.http.policy.HttpLoggingPolicy;
+import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.http.policy.RequestIdPolicy;
+import com.azure.core.http.policy.RetryPolicy;
+import com.azure.core.http.policy.UserAgentPolicy;
+import com.azure.core.implementation.http.policy.spi.HttpPolicyProviders;
+import com.azure.core.util.configuration.Configuration;
+import com.azure.core.util.configuration.ConfigurationManager;
+import com.azure.storage.common.credentials.SASTokenCredential;
+import com.azure.storage.common.credentials.SharedKeyCredential;
+import com.azure.storage.common.policy.SASTokenCredentialPolicy;
+import com.azure.storage.common.policy.SharedKeyCredentialPolicy;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * This class provides a fluent builder API to help aid the configuration and instantiation of the {@link QueueServiceClient queueServiceClients}
+ * and {@link QueueServiceAsyncClient queueServiceAsyncClients}, calling {@link QueueServiceClientBuilder#buildClient() buildClient}
+ * constructs an instance of QueueServiceClient and calling {@link QueueServiceClientBuilder#buildAsyncClient() buildAsyncClient}
+ * constructs an instance of QueueServiceAsyncClient.
+ *
+ * 
The client needs the endpoint of the Azure Storage Queue service, name of the share, and authorization credential.
+ * {@link QueueServiceClientBuilder#endpoint(String) endpoint} gives the builder the endpoint and may give the builder the
+ * A {@link SASTokenCredential} that authorizes the client.

+ *
+ * 
Instantiating a synchronous Queue Service Client with SAS token

+ * {@codesnippet com.azure.storage.queue.queueServiceClient.instantiation.sastoken}
+ *
+ * 
Instantiating an Asynchronous Queue Service Client with SAS token

+ * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation.sastoken}
+ *
+ * 
+ * QueueServiceClient client = QueueServiceClient.builder()
+ *     .endpoint(endpointWithSASTokenQueryParams)
+ *     .buildClient();
+ * 

+ *
+ * 
+ * QueueServiceAsyncClient client = QueueServiceAsyncClient.builder()
+ *     .endpoint(endpointWithSASTokenQueryParams)
+ *     .buildAsyncClient();
+ * 

+ *
+ * 
If the {@code endpoint} doesn't contain the query parameters to construct a {@code SASTokenCredential} they may
+ * be set using {@link QueueServiceClientBuilder#credential(SASTokenCredential) credential}.

+ *
+ * 
Another way to authenticate the client is using a {@link SharedKeyCredential}. To create a SharedKeyCredential
+ * a connection string from the Storage Queue service must be used. Set the SharedKeyCredential with
+ * {@link QueueServiceClientBuilder#connectionString(String) connectionString}. If the builder has both a SASTokenCredential and
+ * SharedKeyCredential the SharedKeyCredential will be preferred when authorizing requests sent to the service.

+ *
+ * 
Instantiating a synchronous Queue Service Client with connection string.

+ * {@codesnippet com.azure.storage.queue.queueServiceClient.instantiation.connectionstring}
+ *
+ * 
Instantiating an Asynchronous Queue Service Client with connection string.

+ * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation.connectionstring}
+ *
+ * @see QueueServiceClient
+ * @see QueueServiceAsyncClient
+ * @see SASTokenCredential
+ * @see SharedKeyCredential
+ */
+public final class QueueServiceClientBuilder {
+    private final List policies;
+
+    private URL endpoint;
+    private SASTokenCredential sasTokenCredential;
+    private SharedKeyCredential sharedKeyCredential;
+    private HttpClient httpClient;
+    private HttpPipeline pipeline;
+    private HttpLogDetailLevel logLevel;
+    private RetryPolicy retryPolicy;
+    private Configuration configuration;
+
+    /**
+     * Creates a builder instance that is able to configure and construct {@link QueueServiceClient QueueServiceClients}
+     * and {@link QueueServiceAsyncClient QueueServiceAsyncClients}.
+     */
+    public QueueServiceClientBuilder() {
+        retryPolicy = new RetryPolicy();
+        logLevel = HttpLogDetailLevel.NONE;
+        policies = new ArrayList<>();
+        configuration = ConfigurationManager.getConfiguration();
+        retryPolicy = new RetryPolicy();
+        logLevel = HttpLogDetailLevel.NONE;
+    }
+
+    /**
+     * Creates a {@link QueueServiceAsyncClient} based on options set in the builder. Every time {@code buildAsyncClient()} is
+     * called a new instance of {@link QueueServiceAsyncClient} is created.
+     *
+     * 

+     * If {@link QueueServiceClientBuilder#pipeline(HttpPipeline) pipeline} is set, then the {@code pipeline} and
+     * {@link QueueServiceClientBuilder#endpoint(String) endpoint} are used to create the
+     * {@link QueueServiceAsyncClient client}. All other builder settings are ignored.
+     * 

+     *
+     * @return A QueueServiceAsyncClient with the options set from the builder.
+     * @throws NullPointerException If {@code endpoint} or {@code queueName} have not been set.
+     * @throws IllegalArgumentException If neither a {@link SharedKeyCredential} or {@link SASTokenCredential} has been set.
+     */
+    public QueueServiceAsyncClient buildAsyncClient() {
+        Objects.requireNonNull(endpoint);
+
+        if (sasTokenCredential == null && sharedKeyCredential == null) {
+            throw new IllegalArgumentException("Credentials are required for authorization");
+        }
+
+        if (pipeline != null) {
+            return new QueueServiceAsyncClient(endpoint, pipeline);
+        }
+        // Closest to API goes first, closest to wire goes last.
+        final List policies = new ArrayList<>();
+
+        policies.add(new UserAgentPolicy(QueueConfiguration.NAME, QueueConfiguration.VERSION, configuration));
+        policies.add(new RequestIdPolicy());
+        policies.add(new AddDatePolicy());
+
+        if (sharedKeyCredential != null) {
+            policies.add(new SharedKeyCredentialPolicy(sharedKeyCredential));
+        } else {
+            policies.add(new SASTokenCredentialPolicy(sasTokenCredential));
+        }
+
+        HttpPolicyProviders.addBeforeRetryPolicies(policies);
+
+        policies.add(retryPolicy);
+
+        policies.addAll(this.policies);
+        HttpPolicyProviders.addAfterRetryPolicies(policies);
+        policies.add(new HttpLoggingPolicy(logLevel));
+
+        HttpPipeline pipeline = HttpPipeline.builder()
+            .policies(policies.toArray(new HttpPipelinePolicy[0]))
+            .httpClient(httpClient)
+            .build();
+
+        return new QueueServiceAsyncClient(endpoint, pipeline);
+    }
+
+    /**
+     * Creates a {@link QueueServiceClient} based on options set in the builder. Every time {@code buildClient()} is
+     * called a new instance of {@link QueueServiceClient} is created.
+     *
+     * 

+     * If {@link QueueServiceClientBuilder#pipeline(HttpPipeline) pipeline} is set, then the {@code pipeline} and
+     * {@link QueueServiceClientBuilder#endpoint(String) endpoint} are used to create the
+     * {@link QueueServiceClient client}. All other builder settings are ignored.
+     * 

+     *
+     * @return A QueueServiceClient with the options set from the builder.
+     * @throws NullPointerException If {@code endpoint} or {@code queueName} have not been set.
+     * @throws IllegalStateException If neither a {@link SharedKeyCredential} or {@link SASTokenCredential} has been set.
+     */
+    public QueueServiceClient buildClient() {
+        return new QueueServiceClient(buildAsyncClient());
+    }
+
+
+    /**
+     * Sets the endpoint for the Azure Storage Queue instance that the client will interact with.
+     *
+     * 
Query parameters of the endpoint will be parsed using {@link SASTokenCredential#fromQuery(String) fromQuery} in an
+     * attempt to generate a {@link SASTokenCredential} to authenticate requests sent to the service.

+     *
+     * @param endpoint The URL of the Azure Storage Queue instance to send service requests to and receive responses from.
+     * @return the updated QueueServiceClientBuilder object
+     * @throws IllegalArgumentException If {@code endpoint} isn't a proper URL
+     */
+    public QueueServiceClientBuilder endpoint(String endpoint) {
+        Objects.requireNonNull(endpoint);
+        try {
+            URL fullURL = new URL(endpoint);
+            this.endpoint = new URL(fullURL.getProtocol() + "://" + fullURL.getHost());
+
+            // Attempt to get the SAS token from the URL passed
+            SASTokenCredential credential = SASTokenCredential.fromQuery(fullURL.getQuery());
+            if (credential != null) {
+                this.sasTokenCredential = credential;
+            }
+        } catch (MalformedURLException ex) {
+            throw new IllegalArgumentException("The Azure Storage Queue endpoint url is malformed.");
+        }
+
+        return this;
+    }
+
+    /**
+     * Sets the {@link SASTokenCredential} used to authenticate requests sent to the Queue service.
+     *
+     * @param credential SAS token credential generated from the Storage account that authorizes requests
+     * @return the updated QueueServiceClientBuilder object
+     * @throws NullPointerException If {@code credential} is {@code null}.
+     */
+    public QueueServiceClientBuilder credential(SASTokenCredential credential) {
+        this.sasTokenCredential = credential;
+        return this;
+    }
+
+    /**
+     * Creates a {@link SharedKeyCredential} from the {@code connectionString} used to authenticate requests sent to the
+     * Queue service.
+     *
+     * @param connectionString Connection string from the Access Keys section in the Storage account
+     * @return the updated QueueServiceClientBuilder object
+     * @throws NullPointerException If {@code connectionString} is {@code null}.
+     */
+    public QueueServiceClientBuilder connectionString(String connectionString) {
+        Objects.requireNonNull(connectionString);
+        this.sharedKeyCredential = SharedKeyCredential.fromConnectionString(connectionString);
+        return this;
+    }
+
+    /**
+     * Sets the HTTP client to use for sending and receiving requests to and from the service.
+     *
+     * @param httpClient The HTTP client to use for requests.
+     * @return The updated QueueServiceClientBuilder object.
+     * @throws NullPointerException If {@code httpClient} is {@code null}.
+     */
+    public QueueServiceClientBuilder httpClient(HttpClient httpClient) {
+        this.httpClient = httpClient;
+        return this;
+    }
+
+    /**
+     * Adds a policy to the set of existing policies that are executed after the {@link RetryPolicy}.
+     *
+     * @param pipelinePolicy The retry policy for service requests.
+     * @return The updated QueueServiceClientBuilder object.
+     * @throws NullPointerException If {@code pipelinePolicy} is {@code null}.
+     */
+    public QueueServiceClientBuilder addPolicy(HttpPipelinePolicy pipelinePolicy) {
+        this.policies.add(pipelinePolicy);
+        return this;
+    }
+
+    /**
+     * Sets the logging level for HTTP requests and responses.
+     *
+     * @param logLevel The amount of logging output when sending and receiving HTTP requests/responses.
+     * @return The updated QueueServiceClientBuilder object.
+     */
+    public QueueServiceClientBuilder httpLogDetailLevel(HttpLogDetailLevel logLevel) {
+        this.logLevel = logLevel;
+        return this;
+    }
+
+    /**
+     * Sets the HTTP pipeline to use for the service client.
+     *
+     * If {@code pipeline} is set, all other settings are ignored, aside from {@link QueueServiceClientBuilder#endpoint(String) endpoint}
+     * when building clients.
+     *
+     * @param pipeline The HTTP pipeline to use for sending service requests and receiving responses.
+     * @return The updated QueueServiceClientBuilder object.
+     * @throws NullPointerException If {@code pipeline} is {@code null}.
+     */
+    public QueueServiceClientBuilder pipeline(HttpPipeline pipeline) {
+        Objects.requireNonNull(pipeline);
+        this.pipeline = pipeline;
+        return this;
+    }
+
+    /**
+     * Sets the configuration store that is used during construction of the service client.
+     *
+     * The default configuration store is a clone of the {@link ConfigurationManager#getConfiguration() global
+     * configuration store}, use {@link Configuration#NONE} to bypass using configuration settings during construction.
+     *
+     * @param configuration The configuration store used to
+     * @return The updated QueueServiceClientBuilder object.
+     */
+    public QueueServiceClientBuilder configuration(Configuration configuration) {
+        this.configuration = configuration;
+        return this;
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/README.md b/storage/client/queue/src/main/java/com/azure/storage/queue/README.md
new file mode 100644
index 0000000000000..86ffe940daf0c
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/README.md
@@ -0,0 +1,377 @@
+# Azure Storage Queue client library for Java
+Azure Queue storage is a service for storing large numbers of messages that can be accessed from anywhere in the world via authenticated calls using HTTP or HTTPS. 
+A single queue message can be up to 64 KB in size, and a queue can contain millions of messages, up to the total capacity limit of a storage account.
+
+[Source code][source_code] | [Package (Maven)][package] | [API reference documentation][api_documentation] | [Product documentation][storage_docs]
+
+## Getting started
+
+### Prerequisites
+
+- [Java Development Kit (JDK)][jdk] with version 8 or above
+- [Azure Subscription][azure_subscription]
+- [Create Strorage Account][storage_account]
+
+### Adding the package to your product
+
+```xml
+
+  com.azure
+  azure-storage
+  12.0.0
+
+```
+
+### Create a Storage Account
+To create a Storage Account you can use the Azure Portal or [Azure CLI][azure_cli].
+
+```Powershell
+az group create \
+    --name storage-resource-group \
+    --location westus
+```
+
+### Authenticate the client
+
+In order to interact with the Storage service (Blob, Queue, Message, MessageId, File) you'll need to create an instance of the Service Client class. 
+To make this possible you'll need the Account SAS (shared access signature) string of Storage account. Learn more at [SAS Token][sas_token]
+
+#### Get Credentials
+
+- **SAS Token**
+ 
+a. Use the [Azure CLI][azure_cli] snippet below to get the SAS token from the Storage account.
+
+```Powershell
+az storage queue generate-sas
+    --name {queue name}
+    --expiry {date/time to expire SAS token}
+    --permission {permission to grant}
+    --connection-string {connection string of the storage account}
+```
+
+```Powershell
+CONNECTION_STRING=
+
+az storage queue generate-sas
+    --name javasdksas
+    --expiry 2019-06-05
+    --permission rpau
+    --connection-string $CONNECTION_STRING
+```
+b. Alternatively, get the Account SAS Token from the Azure Portal.
+```
+Go to your storage account -> Shared access signature -> Click on Generate SAS and connection string (after setup)
+```
+
+- **Shared Key Credential**
+
+a. Use account name and account key. Account name is your storage account name.
+```
+// Here is where we get the key
+Go to your storage account -> Access keys -> Key 1/ Key 2 -> Key
+```
+b. Use the connection string
+```
+// Here is where we get the key
+Go to your storage account -> Access Keys -> Keys 1/ Key 2 -> Connection string
+```
+## Key concepts
+### URL format
+Queues are addressable using the following URL format:
+https://.queue.core.windows.net/
+The following URL addresses a queue in the diagram:
+https://myaccount.queue.core.windows.net/images-to-download
+
+#### Resource URI Syntax
+For the storage account, the base URI for queue operations includes the name of the account only:
+```$xslt
+https://myaccount.queue.core.windows.net
+```
+For a queue, the base URI includes the name of the account and the name of the queue:
+```$xslt
+https://myaccount.queue.core.windows.net/myqueue
+```
+
+### Handling Exceptions
+
+```java
+TODO
+```
+
+### Queue Names
+Every queue within an account must have a unique name. The queue name must be a valid DNS name, and cannot be changed once created. Queue names must confirm to the following rules:
+1. A queue name must start with a letter or number, and can only contain letters, numbers, and the dash (-) character.
+1. The first and last letters in the queue name must be alphanumeric. The dash (-) character cannot be the first or last character. Consecutive dash characters are not permitted in the queue name.
+1. All letters in a queue name must be lowercase.
+1. A queue name must be from 3 through 63 characters long.
+
+### Queue Services
+The queue service do operations on the queues in the storage account and manage the queue properties. 
+
+### Queue Service Client
+
+The client performs the interactions with the Queue service, create or delete a queue, getting and setting Queue properties, list queues in account, and get queue statistics. An asynchronous, `QueueServiceAsyncClient`, and synchronous, `QueueClient`, client exists in the SDK allowing for selection of a client based on an application's use case.
+Once you have the value of the SASToken you can create the queue service client with `${accountName}`, `${sasToken}`.
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+
+QueueClient newQueueServiceClient = queueServiceClient.createQueue("myqueue");
+```
+
+or
+
+```Java
+String queueServiceAsyncURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceAsyncClient queueServiceAsyncClient = QueueServiceAsyncClient.builder().endpoint(queueServiceAsyncURL).build();
+queueServiceAsyncClient.createQueue("newAsyncQueue").subscribe(
+    result -> {
+      // do something when new queue created
+    },
+    error -> {
+      // do something if something wrong happened
+    },
+    () -> {
+      // completed, do something
+    });
+```
+
+### Queue
+Azure Queue storage is a service for storing large numbers of messages that can be accessed from anywhere in the world via authenticated calls using HTTP or HTTPS. 
+A single queue message can be up to 64 KB in size, and a queue can contain millions of messages, up to the total capacity limit of a storage account.
+
+### QueueClient
+Once you have the value of the SASToken you can create the queue service client with `${accountName}`, `${queueName}`, `${sasToken}`.
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+// metadata is map of key-value pair, timeout is client side timeout
+QueueClient newQueueClient = queueClient.create(metadata, timeout);
+```
+
+or
+
+```Java
+String queueAsyncURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueAsyncName, sasToken)
+QueueAsyncClient queueAsyncClient = QueueAsyncClient.builder().endpoint(queueAsyncURL).build();
+queueAsyncClient.create(metadata, timeout).subscribe(
+    result -> {
+      // do something when new queue created
+    },
+    error -> {
+      // do something if something wrong happened
+    },
+    () -> {
+      // completed, do something
+    });
+```
+
+## Examples
+
+The following sections provide several code snippets covering some of the most common Configuration Service tasks, including:
+- [Create a Queue](#Create-a-queue)
+- [Delete a queue](#Delete-a-queue)
+- [List the queues in account](#List-queues-in-account)
+- [Get propertiesin Queue account](#Get-properties-in-queue-account)
+- [Set propertiesin Queue account](#Set-properties-in-queue-account)
+- [Get statistcs of queue](#Get-queue-service-statistics)
+- [Enqueue message into a queue](#Enqueue-message-into-a-queue)
+- [Update message into a queue](#Update-message-into-a-queue)
+- [Peek messages into a queue](#Peek-messages-into-a-queue)
+- [Dequeue messages from a queue](#Dequeue-messages-from-a-queue)
+- [Delete message from a queue](#Delete-message-from-a-queue)
+- [Get a Queue properties](#Get-a-queue-properties)
+- [Set/Update a Queue metadata](#Set-a-queue-metadata)
+### Create a queue
+
+Create a queue in the Storage Account. Throws StorageErrorException If the queue fails to be created.
+
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+
+QueueClient newQueueServiceClient = queueServiceClient.createQueue("myqueue");
+```
+### Delete a queue
+
+Delete a queue in the Storage Account. Throws StorageErrorException If the queue fails to be deleted.
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+
+QueueClient newQueueServiceClient = queueServiceClient.deleteQueue("myqueue");
+```
+
+### List queues in account
+
+List all the queues in account.
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+// @param marker: Starting point to list the queues
+// @param options: Filter for queue selection
+queueServiceClient.listQueuesSegment(marker, options).forEach{
+    queueItem -> {//do something}
+};
+```
+
+### Get properties in queue account
+
+Get queue properties in account, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+
+Response properties = queueServiceClient.getProperties();
+```
+
+### Set properties in queue account
+
+Set queue properties in account, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+
+StorageServiceProperties properties = new StorageServiceProperties() {
+    // logging: some logging;
+    // HourMetrics: some metrics
+    // MinuteMetrics: some metrics
+    // Cors: some cors
+}
+
+queueServiceClient.setProperties(properties);
+```
+
+### Get queue service statistics 
+he `Get Queue Service Stats` operation 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.
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
+QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+
+Response queueStats = queueServiceClient.getStatistics();
+```
+
+### Enqueue message into a queue
+The 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.
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+
+queueClient.enqueueMessage("myMessage");
+```
+
+### Update messaged from a queue
+The operation updates a message in the message queue. 
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+// @param messageId Id of the message
+// @param popReceipt Unique identifier that must match the message for it to be updated
+// @param visibilityTimeout How long the message will be invisible in the queue in seconds
+queueClient.updateMessage(messageId, "new message", popReceipt, visibilityTimeout);
+```
+
+### Peek messages from a queue
+The operation retrieves one or more messages from the front of the queue.
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+
+queueClient.peekMessages().forEach(message-> {print message.messageText();});
+```
+
+
+### Dequeue messages from a queue
+The operation retrieves one or more messages from the front of the queue.
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+
+queueClient.dequeueMessage("myMessage").forEach(message-> {print message.messageText();});
+```
+
+
+### Delete message from a queue
+The operation retrieves one or more messages from the front of the queue.
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+
+queueClient.deleteMessage(messageId, popReceipt);
+```
+
+### Get a queue properties
+The operation retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated with the queue as name-values pairs.
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+
+Response properties = queueClient.getProperties();
+```
+
+### Set a queue metadata
+The operation sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.
+```Java
+String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+
+Map metadata =  new HashMap<>() {{
+    put("key1", "val1");
+    put("key2", "val2");
+}};
+queueClient.setMetadata(metadata);
+```
+
+
+## Troubleshooting
+
+## General
+
+When you interact with queue using this Java client library, errors returned by the service correspond to the same HTTP status codes returned for [REST API][storage_rest] requests. For example, if you try to retrieve a queue that doesn't exist in your Storage Account, a `404` error is returned, indicating `Not Found`.
+
+## Next steps
+
+### More Samples
+- QueueServiceSample
+- MessageSample
+- QueueExceptionSample
+- AsyncSample
+
+[Quickstart: Create a Java Spring app with App Configuration](https://docs.microsoft.com/en-us/azure/azure-app-configuration/quickstart-java-spring-app)
+
+## Contributing
+This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
+the rights to use your contribution. For details, visit https://cla.microsoft.com.
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
+a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
+provided by the bot. You will only need to do this once across all repos using our CLA.
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
+contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
+If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines.html).
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+
+[source_code]: to-be-continue
+[package]: to-be-continue
+[api_documentation]: https://docs.microsoft.com/en-us/rest/api/storageservices/queue-service-rest-api
+[storage_docs]: https://docs.microsoft.com/en-us/azure/storage/queues/storage-queues-introduction
+[jdk]: https://docs.microsoft.com/en-us/java/azure/java-supported-jdk-runtime?view=azure-java-stable
+[maven]: https://maven.apache.org/
+[azure_subscription]: https://azure.microsoft.com/en-us/free/
+[storage_account]: https://docs.microsoft.com/en-us/azure/storage/common/storage-quickstart-create-account?tabs=azure-portal
+[azure_cli]: https://docs.microsoft.com/cli/azure
+[sas_token]: https://docs.microsoft.com/en-us/azure/storage/common/storage-dotnet-shared-access-signature-part-1
+[storage_rest]: https://docs.microsoft.com/en-us/rest/api/storageservices/queue-service-error-codes
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
index 4f678dfe10832..f3582e10e1a44 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
@@ -75,9 +75,7 @@ public AzureQueueStorageImpl build() {
         if (this.url != null) {
             client.url(this.url);
         }
-        if (this.version != null) {
-            client.version(this.version);
-        }
+        client.version(this.version);
         return client;
     }
 }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessageIdsImpl.java b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessageIdsImpl.java
index 8a705fe7e4af7..f5e6c952f5de1 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessageIdsImpl.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessageIdsImpl.java
@@ -10,6 +10,7 @@
 import com.azure.core.annotations.HeaderParam;
 import com.azure.core.annotations.Host;
 import com.azure.core.annotations.HostParam;
+import com.azure.core.annotations.PathParam;
 import com.azure.core.annotations.PUT;
 import com.azure.core.annotations.QueryParam;
 import com.azure.core.annotations.Service;
@@ -57,12 +58,12 @@ private interface MessageIdsService {
         @PUT("{queueName}/messages/{messageid}")
         @ExpectedResponses({204})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono update(@HostParam("url") String url, @BodyParam("application/xml; charset=utf-8") QueueMessage queueMessage, @QueryParam("popreceipt") String popReceipt, @QueryParam("visibilitytimeout") int visibilitytimeout, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono update(@HostParam("url") String url, @PathParam("queueName") String queueName, @PathParam("messageid") String messageId, @BodyParam("application/xml; charset=utf-8") QueueMessage queueMessage, @QueryParam("popreceipt") String popReceipt, @QueryParam("visibilitytimeout") int visibilitytimeout, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
 
         @DELETE("{queueName}/messages/{messageid}")
         @ExpectedResponses({204})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono delete(@HostParam("url") String url, @QueryParam("popreceipt") String popReceipt, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono delete(@HostParam("url") String url, @PathParam("queueName") String queueName, @PathParam("messageid") String messageId, @QueryParam("popreceipt") String popReceipt, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
     }
 
     /**
@@ -75,10 +76,10 @@ private interface MessageIdsService {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono updateWithRestResponseAsync(QueueMessage queueMessage, String popReceipt, int visibilitytimeout, Context context) {
+    public Mono updateWithRestResponseAsync(String queueName, String messageId, QueueMessage queueMessage, String popReceipt, int visibilitytimeout, Context context) {
         final Integer timeout = null;
         final String requestId = null;
-        return service.update(this.client.url(), queueMessage, popReceipt, visibilitytimeout, timeout, this.client.version(), requestId, context);
+        return service.update(this.client.url(), queueName, messageId, queueMessage, popReceipt, visibilitytimeout, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -93,8 +94,8 @@ public Mono updateWithRestResponseAsync(QueueMessage q
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono updateWithRestResponseAsync(QueueMessage queueMessage, String popReceipt, int visibilitytimeout, Integer timeout, String requestId, Context context) {
-        return service.update(this.client.url(), queueMessage, popReceipt, visibilitytimeout, timeout, this.client.version(), requestId, context);
+    public Mono updateWithRestResponseAsync(String queueName, String messageId, QueueMessage queueMessage, String popReceipt, int visibilitytimeout, Integer timeout, String requestId, Context context) {
+        return service.update(this.client.url(), queueName, messageId, queueMessage, popReceipt, visibilitytimeout, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -105,10 +106,10 @@ public Mono updateWithRestResponseAsync(QueueMessage q
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono deleteWithRestResponseAsync(String popReceipt, Context context) {
+    public Mono deleteWithRestResponseAsync(String queueName, String messageId, String popReceipt, Context context) {
         final Integer timeout = null;
         final String requestId = null;
-        return service.delete(this.client.url(), popReceipt, timeout, this.client.version(), requestId, context);
+        return service.delete(this.client.url(), queueName, messageId, popReceipt, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -121,7 +122,7 @@ public Mono deleteWithRestResponseAsync(String popRece
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono deleteWithRestResponseAsync(String popReceipt, Integer timeout, String requestId, Context context) {
-        return service.delete(this.client.url(), popReceipt, timeout, this.client.version(), requestId, context);
+    public Mono deleteWithRestResponseAsync(String queueName, String messageId, String popReceipt, Integer timeout, String requestId, Context context) {
+        return service.delete(this.client.url(), queueName, messageId, popReceipt, timeout, this.client.version(), requestId, context);
     }
 }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessagesImpl.java b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessagesImpl.java
index ee59aae16b63f..84f680cad1dba 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessagesImpl.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/MessagesImpl.java
@@ -11,6 +11,7 @@
 import com.azure.core.annotations.HeaderParam;
 import com.azure.core.annotations.Host;
 import com.azure.core.annotations.HostParam;
+import com.azure.core.annotations.PathParam;
 import com.azure.core.annotations.POST;
 import com.azure.core.annotations.QueryParam;
 import com.azure.core.annotations.Service;
@@ -60,22 +61,22 @@ private interface MessagesService {
         @GET("{queueName}/messages")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono dequeue(@HostParam("url") String url, @QueryParam("numofmessages") Integer numberOfMessages, @QueryParam("visibilitytimeout") Integer visibilitytimeout, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono dequeue(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("numofmessages") Integer numberOfMessages, @QueryParam("visibilitytimeout") Integer visibilitytimeout, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
 
         @DELETE("{queueName}/messages")
         @ExpectedResponses({204})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono clear(@HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono clear(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
 
         @POST("{queueName}/messages")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono enqueue(@HostParam("url") String url, @BodyParam("application/xml; charset=utf-8") QueueMessage queueMessage, @QueryParam("visibilitytimeout") Integer visibilitytimeout, @QueryParam("messagettl") Integer messageTimeToLive, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono enqueue(@HostParam("url") String url, @PathParam("queueName") String queueName, @BodyParam("application/xml; charset=utf-8") QueueMessage queueMessage, @QueryParam("visibilitytimeout") Integer visibilitytimeout, @QueryParam("messagettl") Integer messageTimeToLive, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
 
         @GET("{queueName}/messages")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono peek(@HostParam("url") String url, @QueryParam("numofmessages") Integer numberOfMessages, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("peekonly") String peekonly, Context context);
+        Mono peek(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("numofmessages") Integer numberOfMessages, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("peekonly") String peekonly, Context context);
     }
 
     /**
@@ -85,12 +86,12 @@ private interface MessagesService {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono dequeueWithRestResponseAsync(Context context) {
+    public Mono dequeueWithRestResponseAsync(String queueName, Context context) {
         final Integer numberOfMessages = null;
         final Integer visibilitytimeout = null;
         final Integer timeout = null;
         final String requestId = null;
-        return service.dequeue(this.client.url(), numberOfMessages, visibilitytimeout, timeout, this.client.version(), requestId, context);
+        return service.dequeue(this.client.url(), queueName, numberOfMessages, visibilitytimeout, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -104,8 +105,8 @@ public Mono dequeueWithRestResponseAsync(Context contex
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono dequeueWithRestResponseAsync(Integer numberOfMessages, Integer visibilitytimeout, Integer timeout, String requestId, Context context) {
-        return service.dequeue(this.client.url(), numberOfMessages, visibilitytimeout, timeout, this.client.version(), requestId, context);
+    public Mono dequeueWithRestResponseAsync(String queueName, Integer numberOfMessages, Integer visibilitytimeout, Integer timeout, String requestId, Context context) {
+        return service.dequeue(this.client.url(), queueName, numberOfMessages, visibilitytimeout, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -115,10 +116,10 @@ public Mono dequeueWithRestResponseAsync(Integer number
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono clearWithRestResponseAsync(Context context) {
+    public Mono clearWithRestResponseAsync(String queueName, Context context) {
         final Integer timeout = null;
         final String requestId = null;
-        return service.clear(this.client.url(), timeout, this.client.version(), requestId, context);
+        return service.clear(this.client.url(), queueName, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -130,8 +131,8 @@ public Mono clearWithRestResponseAsync(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono clearWithRestResponseAsync(Integer timeout, String requestId, Context context) {
-        return service.clear(this.client.url(), timeout, this.client.version(), requestId, context);
+    public Mono clearWithRestResponseAsync(String queueName, Integer timeout, String requestId, Context context) {
+        return service.clear(this.client.url(), queueName, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -142,12 +143,12 @@ public Mono clearWithRestResponseAsync(Integer timeout, S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono enqueueWithRestResponseAsync(QueueMessage queueMessage, Context context) {
+    public Mono enqueueWithRestResponseAsync(String queueName, QueueMessage queueMessage, Context context) {
         final Integer visibilitytimeout = null;
         final Integer messageTimeToLive = null;
         final Integer timeout = null;
         final String requestId = null;
-        return service.enqueue(this.client.url(), queueMessage, visibilitytimeout, messageTimeToLive, timeout, this.client.version(), requestId, context);
+        return service.enqueue(this.client.url(), queueName, queueMessage, visibilitytimeout, messageTimeToLive, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -162,8 +163,8 @@ public Mono enqueueWithRestResponseAsync(QueueMessage q
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono enqueueWithRestResponseAsync(QueueMessage queueMessage, Integer visibilitytimeout, Integer messageTimeToLive, Integer timeout, String requestId, Context context) {
-        return service.enqueue(this.client.url(), queueMessage, visibilitytimeout, messageTimeToLive, timeout, this.client.version(), requestId, context);
+    public Mono enqueueWithRestResponseAsync(String queueName, QueueMessage queueMessage, Integer visibilitytimeout, Integer messageTimeToLive, Integer timeout, String requestId, Context context) {
+        return service.enqueue(this.client.url(), queueName, queueMessage, visibilitytimeout, messageTimeToLive, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -173,12 +174,12 @@ public Mono enqueueWithRestResponseAsync(QueueMessage q
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono peekWithRestResponseAsync(Context context) {
+    public Mono peekWithRestResponseAsync(String queueName, Context context) {
         final Integer numberOfMessages = null;
         final Integer timeout = null;
         final String requestId = null;
         final String peekonly = "true";
-        return service.peek(this.client.url(), numberOfMessages, timeout, this.client.version(), requestId, peekonly, context);
+        return service.peek(this.client.url(), queueName, numberOfMessages, timeout, this.client.version(), requestId, peekonly, context);
     }
 
     /**
@@ -191,8 +192,8 @@ public Mono peekWithRestResponseAsync(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono peekWithRestResponseAsync(Integer numberOfMessages, Integer timeout, String requestId, Context context) {
+    public Mono peekWithRestResponseAsync(String queueName, Integer numberOfMessages, Integer timeout, String requestId, Context context) {
         final String peekonly = "true";
-        return service.peek(this.client.url(), numberOfMessages, timeout, this.client.version(), requestId, peekonly, context);
+        return service.peek(this.client.url(), queueName, numberOfMessages, timeout, this.client.version(), requestId, peekonly, context);
     }
 }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/QueuesImpl.java b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/QueuesImpl.java
index 2eb2d4d1ec2e2..db933d31e4238 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/QueuesImpl.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/QueuesImpl.java
@@ -11,6 +11,7 @@
 import com.azure.core.annotations.HeaderParam;
 import com.azure.core.annotations.Host;
 import com.azure.core.annotations.HostParam;
+import com.azure.core.annotations.PathParam;
 import com.azure.core.annotations.PUT;
 import com.azure.core.annotations.QueryParam;
 import com.azure.core.annotations.Service;
@@ -25,10 +26,9 @@
 import com.azure.storage.queue.models.QueuesSetMetadataResponse;
 import com.azure.storage.queue.models.SignedIdentifier;
 import com.azure.storage.queue.models.StorageErrorException;
-import reactor.core.publisher.Mono;
-
 import java.util.List;
 import java.util.Map;
+import reactor.core.publisher.Mono;
 
 /**
  * An instance of this class provides access to all the operations defined in
@@ -65,32 +65,32 @@ private interface QueuesService {
         @PUT("{queueName}")
         @ExpectedResponses({201, 204})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono create(@HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map metadata, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono create(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map metadata, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
 
         @DELETE("{queueName}")
         @ExpectedResponses({204})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono delete(@HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono delete(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
 
         @GET("{queueName}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono getProperties(@HostParam("url") String url, @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 getProperties(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
 
         @PUT("{queueName}")
         @ExpectedResponses({204})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono setMetadata(@HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map metadata, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
+        Mono setMetadata(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map metadata, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
 
         @GET("{queueName}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono getAccessPolicy(@HostParam("url") String url, @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 getAccessPolicy(@HostParam("url") String url, @PathParam("queueName") String queueName, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
 
         @PUT("{queueName}")
         @ExpectedResponses({204})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono setAccessPolicy(@HostParam("url") String url, @BodyParam("application/xml; charset=utf-8") SignedIdentifiersWrapper queueAcl, @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 setAccessPolicy(@HostParam("url") String url, @PathParam("queueName") String queueName, @BodyParam("application/xml; charset=utf-8") SignedIdentifiersWrapper queueAcl, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
     }
 
     /**
@@ -100,11 +100,11 @@ private interface QueuesService {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono createWithRestResponseAsync(Context context) {
+    public Mono createWithRestResponseAsync(String queueName, Context context) {
         final Integer timeout = null;
         final Map metadata = null;
         final String requestId = null;
-        return service.create(this.client.url(), timeout, metadata, this.client.version(), requestId, context);
+        return service.create(this.client.url(), queueName, timeout, metadata, this.client.version(), requestId, context);
     }
 
     /**
@@ -117,8 +117,8 @@ public Mono createWithRestResponseAsync(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono createWithRestResponseAsync(Integer timeout, Map metadata, String requestId, Context context) {
-        return service.create(this.client.url(), timeout, metadata, this.client.version(), requestId, context);
+    public Mono createWithRestResponseAsync(String queueName, Integer timeout, Map metadata, String requestId, Context context) {
+        return service.create(this.client.url(), queueName, timeout, metadata, this.client.version(), requestId, context);
     }
 
     /**
@@ -128,10 +128,10 @@ public Mono createWithRestResponseAsync(Integer timeout, M
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono deleteWithRestResponseAsync(Context context) {
+    public Mono deleteWithRestResponseAsync(String queueName, Context context) {
         final Integer timeout = null;
         final String requestId = null;
-        return service.delete(this.client.url(), timeout, this.client.version(), requestId, context);
+        return service.delete(this.client.url(), queueName, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -143,8 +143,8 @@ public Mono deleteWithRestResponseAsync(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono deleteWithRestResponseAsync(Integer timeout, String requestId, Context context) {
-        return service.delete(this.client.url(), timeout, this.client.version(), requestId, context);
+    public Mono deleteWithRestResponseAsync(String queueName, Integer timeout, String requestId, Context context) {
+        return service.delete(this.client.url(), queueName, timeout, this.client.version(), requestId, context);
     }
 
     /**
@@ -154,11 +154,11 @@ public Mono deleteWithRestResponseAsync(Integer timeout, S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono getPropertiesWithRestResponseAsync(Context context) {
+    public Mono getPropertiesWithRestResponseAsync(String queueName, Context context) {
         final Integer timeout = null;
         final String requestId = null;
         final String comp = "metadata";
-        return service.getProperties(this.client.url(), timeout, this.client.version(), requestId, comp, context);
+        return service.getProperties(this.client.url(), queueName, timeout, this.client.version(), requestId, comp, context);
     }
 
     /**
@@ -170,9 +170,9 @@ public Mono getPropertiesWithRestResponseAsync(Cont
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono getPropertiesWithRestResponseAsync(Integer timeout, String requestId, Context context) {
+    public Mono getPropertiesWithRestResponseAsync(String queueName, Integer timeout, String requestId, Context context) {
         final String comp = "metadata";
-        return service.getProperties(this.client.url(), timeout, this.client.version(), requestId, comp, context);
+        return service.getProperties(this.client.url(), queueName, timeout, this.client.version(), requestId, comp, context);
     }
 
     /**
@@ -182,12 +182,12 @@ public Mono getPropertiesWithRestResponseAsync(Inte
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono setMetadataWithRestResponseAsync(Context context) {
+    public Mono setMetadataWithRestResponseAsync(String queueName, Context context) {
         final Integer timeout = null;
         final Map metadata = null;
         final String requestId = null;
         final String comp = "metadata";
-        return service.setMetadata(this.client.url(), timeout, metadata, this.client.version(), requestId, comp, context);
+        return service.setMetadata(this.client.url(), queueName, timeout, metadata, this.client.version(), requestId, comp, context);
     }
 
     /**
@@ -200,9 +200,9 @@ public Mono setMetadataWithRestResponseAsync(Context
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono setMetadataWithRestResponseAsync(Integer timeout, Map metadata, String requestId, Context context) {
+    public Mono setMetadataWithRestResponseAsync(String queueName, Integer timeout, Map metadata, String requestId, Context context) {
         final String comp = "metadata";
-        return service.setMetadata(this.client.url(), timeout, metadata, this.client.version(), requestId, comp, context);
+        return service.setMetadata(this.client.url(), queueName, timeout, metadata, this.client.version(), requestId, comp, context);
     }
 
     /**
@@ -212,11 +212,11 @@ public Mono setMetadataWithRestResponseAsync(Integer
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono getAccessPolicyWithRestResponseAsync(Context context) {
+    public Mono getAccessPolicyWithRestResponseAsync(String queueName, Context context) {
         final Integer timeout = null;
         final String requestId = null;
         final String comp = "acl";
-        return service.getAccessPolicy(this.client.url(), timeout, this.client.version(), requestId, comp, context);
+        return service.getAccessPolicy(this.client.url(), queueName, timeout, this.client.version(), requestId, comp, context);
     }
 
     /**
@@ -228,9 +228,9 @@ public Mono getAccessPolicyWithRestResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono getAccessPolicyWithRestResponseAsync(Integer timeout, String requestId, Context context) {
+    public Mono getAccessPolicyWithRestResponseAsync(String queueName, Integer timeout, String requestId, Context context) {
         final String comp = "acl";
-        return service.getAccessPolicy(this.client.url(), timeout, this.client.version(), requestId, comp, context);
+        return service.getAccessPolicy(this.client.url(), queueName, timeout, this.client.version(), requestId, comp, context);
     }
 
     /**
@@ -240,12 +240,12 @@ public Mono getAccessPolicyWithRestResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono setAccessPolicyWithRestResponseAsync(Context context) {
+    public Mono setAccessPolicyWithRestResponseAsync(String queueName, Context context) {
         final Integer timeout = null;
         final String requestId = null;
         final String comp = "acl";
         SignedIdentifiersWrapper queueAclConverted = new SignedIdentifiersWrapper(null);
-        return service.setAccessPolicy(this.client.url(), queueAclConverted, timeout, this.client.version(), requestId, comp, context);
+        return service.setAccessPolicy(this.client.url(), queueName, queueAclConverted, timeout, this.client.version(), requestId, comp, context);
     }
 
     /**
@@ -258,9 +258,9 @@ public Mono setAccessPolicyWithRestResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
-    public Mono setAccessPolicyWithRestResponseAsync(List queueAcl, Integer timeout, String requestId, Context context) {
+    public Mono setAccessPolicyWithRestResponseAsync(String queueName, List queueAcl, Integer timeout, String requestId, Context context) {
         final String comp = "acl";
         SignedIdentifiersWrapper queueAclConverted = new SignedIdentifiersWrapper(queueAcl);
-        return service.setAccessPolicy(this.client.url(), queueAclConverted, timeout, this.client.version(), requestId, comp, context);
+        return service.setAccessPolicy(this.client.url(), queueName, queueAclConverted, timeout, this.client.version(), requestId, comp, context);
     }
 }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/ServicesImpl.java b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/ServicesImpl.java
index dc353d45f5243..1dc20d2b42fa8 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/ServicesImpl.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/implementation/ServicesImpl.java
@@ -25,9 +25,8 @@
 import com.azure.storage.queue.models.ServicesSetPropertiesResponse;
 import com.azure.storage.queue.models.StorageErrorException;
 import com.azure.storage.queue.models.StorageServiceProperties;
-import reactor.core.publisher.Mono;
-
 import java.util.List;
+import reactor.core.publisher.Mono;
 
 /**
  * An instance of this class provides access to all the operations defined in
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/models/DequeuedMessageItem.java b/storage/client/queue/src/main/java/com/azure/storage/queue/models/DequeuedMessage.java
similarity index 85%
rename from storage/client/queue/src/main/java/com/azure/storage/queue/models/DequeuedMessageItem.java
rename to storage/client/queue/src/main/java/com/azure/storage/queue/models/DequeuedMessage.java
index 7febd2c02758d..65e6e941c717a 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/models/DequeuedMessageItem.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/models/DequeuedMessage.java
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
 
 package com.azure.storage.queue.models;
 
@@ -14,7 +13,7 @@
  * on a Queue.
  */
 @JacksonXmlRootElement(localName = "QueueMessage")
-public final class DequeuedMessageItem {
+public final class DequeuedMessage {
     /*
      * The Id of the Message.
      */
@@ -71,9 +70,9 @@ public String messageId() {
      * Set the messageId property: The Id of the Message.
      *
      * @param messageId the messageId value to set.
-     * @return the DequeuedMessageItem object itself.
+     * @return the DequeuedMessage object itself.
      */
-    public DequeuedMessageItem messageId(String messageId) {
+    public DequeuedMessage messageId(String messageId) {
         this.messageId = messageId;
         return this;
     }
@@ -96,9 +95,9 @@ public OffsetDateTime insertionTime() {
      * the Queue.
      *
      * @param insertionTime the insertionTime value to set.
-     * @return the DequeuedMessageItem object itself.
+     * @return the DequeuedMessage object itself.
      */
-    public DequeuedMessageItem insertionTime(OffsetDateTime insertionTime) {
+    public DequeuedMessage insertionTime(OffsetDateTime insertionTime) {
         if (insertionTime == null) {
             this.insertionTime = null;
         } else {
@@ -125,9 +124,9 @@ public OffsetDateTime expirationTime() {
      * and be automatically deleted.
      *
      * @param expirationTime the expirationTime value to set.
-     * @return the DequeuedMessageItem object itself.
+     * @return the DequeuedMessage object itself.
      */
-    public DequeuedMessageItem expirationTime(OffsetDateTime expirationTime) {
+    public DequeuedMessage expirationTime(OffsetDateTime expirationTime) {
         if (expirationTime == null) {
             this.expirationTime = null;
         } else {
@@ -153,9 +152,9 @@ public String popReceipt() {
      * been dequeued by another client.
      *
      * @param popReceipt the popReceipt value to set.
-     * @return the DequeuedMessageItem object itself.
+     * @return the DequeuedMessage object itself.
      */
-    public DequeuedMessageItem popReceipt(String popReceipt) {
+    public DequeuedMessage popReceipt(String popReceipt) {
         this.popReceipt = popReceipt;
         return this;
     }
@@ -178,9 +177,9 @@ public OffsetDateTime timeNextVisible() {
      * become visible in the Queue.
      *
      * @param timeNextVisible the timeNextVisible value to set.
-     * @return the DequeuedMessageItem object itself.
+     * @return the DequeuedMessage object itself.
      */
-    public DequeuedMessageItem timeNextVisible(OffsetDateTime timeNextVisible) {
+    public DequeuedMessage timeNextVisible(OffsetDateTime timeNextVisible) {
         if (timeNextVisible == null) {
             this.timeNextVisible = null;
         } else {
@@ -204,9 +203,9 @@ public long dequeueCount() {
      * dequeued.
      *
      * @param dequeueCount the dequeueCount value to set.
-     * @return the DequeuedMessageItem object itself.
+     * @return the DequeuedMessage object itself.
      */
-    public DequeuedMessageItem dequeueCount(long dequeueCount) {
+    public DequeuedMessage dequeueCount(long dequeueCount) {
         this.dequeueCount = dequeueCount;
         return this;
     }
@@ -224,9 +223,9 @@ public String messageText() {
      * Set the messageText property: The content of the Message.
      *
      * @param messageText the messageText value to set.
-     * @return the DequeuedMessageItem object itself.
+     * @return the DequeuedMessage object itself.
      */
-    public DequeuedMessageItem messageText(String messageText) {
+    public DequeuedMessage messageText(String messageText) {
         this.messageText = messageText;
         return this;
     }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesDequeueResponse.java b/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesDequeueResponse.java
index 4ab4b09a4a620..c08c7ccc025c7 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesDequeueResponse.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesDequeueResponse.java
@@ -12,7 +12,7 @@
 /**
  * Contains all response data for the dequeue operation.
  */
-public final class MessagesDequeueResponse extends ResponseBase> {
+public final class MessagesDequeueResponse extends ResponseBase> {
     /**
      * Creates an instance of MessagesDequeueResponse.
      *
@@ -22,7 +22,7 @@ public final class MessagesDequeueResponse extends ResponseBase value, MessagesDequeueHeaders headers) {
+    public MessagesDequeueResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, List value, MessagesDequeueHeaders headers) {
         super(request, statusCode, rawHeaders, value, headers);
     }
 
@@ -30,7 +30,7 @@ public MessagesDequeueResponse(HttpRequest request, int statusCode, HttpHeaders
      * @return the deserialized response body.
      */
     @Override
-    public List value() {
+    public List value() {
         return super.value();
     }
 }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesPeekResponse.java b/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesPeekResponse.java
index 8ca8ed06fd99c..27ac646138908 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesPeekResponse.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/models/MessagesPeekResponse.java
@@ -12,7 +12,7 @@
 /**
  * Contains all response data for the peek operation.
  */
-public final class MessagesPeekResponse extends ResponseBase> {
+public final class MessagesPeekResponse extends ResponseBase> {
     /**
      * Creates an instance of MessagesPeekResponse.
      *
@@ -22,7 +22,7 @@ public final class MessagesPeekResponse extends ResponseBase value, MessagesPeekHeaders headers) {
+    public MessagesPeekResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, List value, MessagesPeekHeaders headers) {
         super(request, statusCode, rawHeaders, value, headers);
     }
 
@@ -30,7 +30,7 @@ public MessagesPeekResponse(HttpRequest request, int statusCode, HttpHeaders raw
      * @return the deserialized response body.
      */
     @Override
-    public List value() {
+    public List value() {
         return super.value();
     }
 }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/models/PeekedMessageItem.java b/storage/client/queue/src/main/java/com/azure/storage/queue/models/PeekedMessage.java
similarity index 85%
rename from storage/client/queue/src/main/java/com/azure/storage/queue/models/PeekedMessageItem.java
rename to storage/client/queue/src/main/java/com/azure/storage/queue/models/PeekedMessage.java
index d86bdab8c2305..edc9960d2d747 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/models/PeekedMessageItem.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/models/PeekedMessage.java
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
 
 package com.azure.storage.queue.models;
 
@@ -14,7 +13,7 @@
  * on a Queue.
  */
 @JacksonXmlRootElement(localName = "QueueMessage")
-public final class PeekedMessageItem {
+public final class PeekedMessage {
     /*
      * The Id of the Message.
      */
@@ -58,9 +57,9 @@ public String messageId() {
      * Set the messageId property: The Id of the Message.
      *
      * @param messageId the messageId value to set.
-     * @return the PeekedMessageItem object itself.
+     * @return the PeekedMessage object itself.
      */
-    public PeekedMessageItem messageId(String messageId) {
+    public PeekedMessage messageId(String messageId) {
         this.messageId = messageId;
         return this;
     }
@@ -83,9 +82,9 @@ public OffsetDateTime insertionTime() {
      * the Queue.
      *
      * @param insertionTime the insertionTime value to set.
-     * @return the PeekedMessageItem object itself.
+     * @return the PeekedMessage object itself.
      */
-    public PeekedMessageItem insertionTime(OffsetDateTime insertionTime) {
+    public PeekedMessage insertionTime(OffsetDateTime insertionTime) {
         if (insertionTime == null) {
             this.insertionTime = null;
         } else {
@@ -112,9 +111,9 @@ public OffsetDateTime expirationTime() {
      * and be automatically deleted.
      *
      * @param expirationTime the expirationTime value to set.
-     * @return the PeekedMessageItem object itself.
+     * @return the PeekedMessage object itself.
      */
-    public PeekedMessageItem expirationTime(OffsetDateTime expirationTime) {
+    public PeekedMessage expirationTime(OffsetDateTime expirationTime) {
         if (expirationTime == null) {
             this.expirationTime = null;
         } else {
@@ -138,9 +137,9 @@ public long dequeueCount() {
      * dequeued.
      *
      * @param dequeueCount the dequeueCount value to set.
-     * @return the PeekedMessageItem object itself.
+     * @return the PeekedMessage object itself.
      */
-    public PeekedMessageItem dequeueCount(long dequeueCount) {
+    public PeekedMessage dequeueCount(long dequeueCount) {
         this.dequeueCount = dequeueCount;
         return this;
     }
@@ -158,9 +157,9 @@ public String messageText() {
      * Set the messageText property: The content of the Message.
      *
      * @param messageText the messageText value to set.
-     * @return the PeekedMessageItem object itself.
+     * @return the PeekedMessage object itself.
      */
-    public PeekedMessageItem messageText(String messageText) {
+    public PeekedMessage messageText(String messageText) {
         this.messageText = messageText;
         return this;
     }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/models/QueueProperties.java b/storage/client/queue/src/main/java/com/azure/storage/queue/models/QueueProperties.java
new file mode 100644
index 0000000000000..bb343ea96bd24
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/models/QueueProperties.java
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.storage.queue.models;
+
+import java.util.Map;
+
+/**
+ * Model class containing properties of a specific queue in the storage Queue service.
+ */
+public final class QueueProperties {
+    private final Map metadata;
+    private final int approximateMessagesCount;
+
+    /**
+     * Creates an instance that contains properties of a queue.
+     *
+     * @param metadata Metadata associated with the queue
+     * @param approximateMessagesCount Approximate number of messages contained in the queue
+     */
+    public QueueProperties(Map metadata, int approximateMessagesCount) {
+        this.metadata = metadata;
+        this.approximateMessagesCount = approximateMessagesCount;
+    }
+
+    /**
+     * @return the user-defined metadata associated with the queue
+     */
+    public Map metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * @return the approximate number of messages contained in the queue at the time of properties retrieval
+     */
+    public int approximateMessagesCount() {
+        return approximateMessagesCount;
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/models/QueuesSegmentOptions.java b/storage/client/queue/src/main/java/com/azure/storage/queue/models/QueuesSegmentOptions.java
new file mode 100644
index 0000000000000..d58b2f71b8d05
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/models/QueuesSegmentOptions.java
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.storage.queue.models;
+
+import com.azure.storage.queue.QueueServiceAsyncClient;
+import com.azure.storage.queue.QueueServiceClient;
+
+/**
+ * A set of options for selecting queues from Storage Queue service.
+ *
+ * 
    
+ *     
  • 
+ *         Providing {@link QueuesSegmentOptions#prefix() prefix} will filter {@link QueueItem queues} that begin
+ *         with the prefix.
+ *     
    • 
+ *     
  • 
+ *         Providing {@link QueuesSegmentOptions#maxResults() maxResults} will limit the number of {@link QueueItem queues}
+ *         returned in a single page.
+ *     
    • 
+ *     
  • 
+ *         Setting {@link QueuesSegmentOptions#includeMetadata() includeMetadata} to true will include the metadata of
+ *         each {@link QueueItem queue}, if false {@link QueueItem#metadata() metadata} for each queue will be {@code null}.
+ *     
    • 
+ * 

+ *
+ * @see QueueServiceClient
+ * @see QueueServiceAsyncClient
+ */
+public final class QueuesSegmentOptions {
+    private boolean includeMetadata;
+
+    private String prefix;
+
+    private Integer maxResults;
+
+    /**
+     * @return the status of including metadata when listing queues
+     */
+    public boolean includeMetadata() {
+        return includeMetadata;
+    }
+
+    /**
+     * Sets the status of including queue metadata when listing queues
+     *
+     * @param includeMetadata Flag indicating if metadata should be included in the listing
+     * @return An updated QueuesSegmentOptions object
+     */
+    public QueuesSegmentOptions includeMetadata(boolean includeMetadata) {
+        this.includeMetadata = includeMetadata;
+        return this;
+    }
+
+    /**
+     * @return the prefix the queue name must match to be included in the listing
+     */
+    public String prefix() {
+        return prefix;
+    }
+
+    /**
+     * Sets the prefix that a queue must match to be included in the listing
+     *
+     * @param prefix The prefix that queues must start with to pass the filter
+     * @return An updated QueuesSegmentOptions object
+     */
+    public QueuesSegmentOptions prefix(String prefix) {
+        this.prefix = prefix;
+        return this;
+    }
+
+    /**
+     * @return the maximum number of queues to include in a single response
+     */
+    public Integer maxResults() {
+        return maxResults;
+    }
+
+    /**
+     * Sets the maximum number of queues to include in a single response
+     *
+     * @param maxResults Maximum number of results to include in a single response
+     * @return An updated QueuesSegmentOptions object
+     */
+    public QueuesSegmentOptions maxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+        return this;
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/models/UpdatedMessage.java b/storage/client/queue/src/main/java/com/azure/storage/queue/models/UpdatedMessage.java
new file mode 100644
index 0000000000000..fa6a4d5970153
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/models/UpdatedMessage.java
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.storage.queue.models;
+
+import java.time.OffsetDateTime;
+
+/**
+ * Response from the service when updating a message. Contains the information needed to continue working with
+ * the specific message.
+ */
+public final class UpdatedMessage {
+    private final String popReceipt;
+    private final OffsetDateTime timeNextVisible;
+
+    /**
+     * Creates an instance of updated message information.
+     *
+     * @param popReceipt Unique identifier that verifies the operation on a message is valid
+     * @param timeNextVisible The next time the message will be visible to other operations in the queue
+     */
+    public UpdatedMessage(String popReceipt, OffsetDateTime timeNextVisible) {
+        this.popReceipt = popReceipt;
+        this.timeNextVisible = timeNextVisible;
+    }
+
+    /**
+     * @return the unique identifier used to verify that the operation is allowed on the message
+     */
+    public String popReceipt() {
+        return popReceipt;
+    }
+
+    /**
+     * @return the next time the message will be visible to other operations in the queue
+     */
+    public OffsetDateTime timeNextVisible() {
+        return timeNextVisible;
+    }
+}
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java
new file mode 100644
index 0000000000000..01ab9ae55481a
--- /dev/null
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue;
+
+import java.util.UUID;
+
+/*
+ *  This example mimics some arbitrary number of clients continuously sending messages up to a queue in a parallel and
+ *  a server dequeuing the messages and processing them.
+ */
+public class AsyncSamples {
+    private static final String ACCOUNT_NAME = System.getenv("AZURE_STORAGE_ACCOUNT_NAME");
+    private static final String SAS_TOKEN = System.getenv("PRIMARY_SAS_TOKEN");
+    private static final String QUEUE_NAME = generateRandomName("async-call", 16);
+
+    /**
+     * The main method shows how we do the basic operations of enqueueing and dequeueing messages on async queue client.
+     * @param args No args needed for main method.
+     */
+    public static void main(String[] args) {
+        // Create an async queue client.
+        String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", ACCOUNT_NAME, QUEUE_NAME, SAS_TOKEN);
+        QueueAsyncClient queueAsyncClient = new QueueClientBuilder().endpoint(queueURL).buildAsyncClient();
+
+        // Create a queue, enqueue two messages.
+        queueAsyncClient.create()
+            .flatMap(response -> queueAsyncClient.enqueueMessage("This is message 1"))
+            .flatMap(response -> queueAsyncClient.enqueueMessage("This is message 2"))
+            .subscribe(
+                response -> {
+                    System.out.println("Message successfully equeueed by queueAsyncClient. Message id:" + response.value().messageId());
+                },
+                err -> {
+                    System.out.println("Error thrown when enqueue the message. Error message: " + err.getMessage());
+                },
+                () -> {
+                    System.out.println("The enqueue has been completed.");
+                }
+            );
+    }
+
+    private static String generateRandomName(String prefix, int length) {
+        int len = length > prefix.length() ? length - prefix.length() : 0;
+        return prefix + UUID.randomUUID().toString().substring(0, len);
+    }
+}
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSample.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSample.java
new file mode 100644
index 0000000000000..124c5023a1bcb
--- /dev/null
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSample.java
@@ -0,0 +1,77 @@
+// 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.storage.queue.models.DequeuedMessage;
+
+import java.time.Duration;
+import java.util.UUID;
+
+public class MessageSample {
+    private static final String ACCOUNT_NAME = System.getenv("AZURE_STORAGE_ACCOUNT_NAME");
+    private static final String SAS_TOKEN = System.getenv("PRIMARY_SAS_TOKEN");
+
+    /**
+     * The main method illustrate the basic operations for enqueue and dequeue messages using sync client.
+     * @param args No args needed for main method.
+     * @throws InterruptedException If the Thread.sleep operation gets interrupted.
+     */
+    public static void main(String[] args) throws InterruptedException {
+        // Build Queue Client using SAS Token
+        String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", ACCOUNT_NAME, SAS_TOKEN);
+        QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).buildClient();
+
+        // Create a queue client
+        Response queueClientResponse = queueServiceClient.createQueue(generateRandomName("enqueue", 16));
+        QueueClient queueClient = queueClientResponse.value();
+        // Using queue client to enqueue several "Hello World" messages into queue.
+        for (int i = 0; i < 3; i++) {
+            queueClient.enqueueMessage("Hello World");
+        }
+
+        // Enqueue json file into message.
+        // TODO
+
+        // Get the total count of msg in the queue
+        int count = queueClient.getProperties().value().approximateMessagesCount();
+
+        // Peek all messages in queue. It is supposed to print "Hello World" 3 times.
+        queueClient.peekMessages(count).forEach(
+            peekedMessage -> {
+                System.out.println("Here is the msg: " + peekedMessage.messageText());
+            }
+        );
+
+        // Dequeue all messages in queue and update the message "Hello World" to Hello, world!"
+        queueClient.dequeueMessages(count, Duration.ZERO).forEach(
+            queueMessage -> {
+                String msgToReplace = String.format("Hello, world!");
+                queueClient.updateMessage(queueMessage.messageId(), msgToReplace, queueMessage.popReceipt(), Duration.ZERO);
+            }
+        );
+
+        // Delete the first available msg.
+        // Since there is no invisible time for above dequeue, the following if condition should be true.
+        if (queueClient.dequeueMessages().iterator().hasNext()) {
+            DequeuedMessage queueMessage = queueClient.dequeueMessages().iterator().next();
+            queueClient.deleteMessage(queueMessage.messageId(), queueMessage.popReceipt());
+        } else {
+            System.out.println("OOps, the messages disappear!");
+        }
+
+        // Clear all messages in the queue
+        // Sleep to guarantee we skip the default invisible time.
+        Thread.sleep(500);
+        queueClient.clearMessages();
+
+        // Finally, we delete the queue.
+        queueClient.delete();
+    }
+
+    private static String generateRandomName(String prefix, int length) {
+        int len = length > prefix.length() ? length - prefix.length() : 0;
+        return prefix + UUID.randomUUID().toString().substring(0, len);
+    }
+}
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java
new file mode 100644
index 0000000000000..aaddf3ed337eb
--- /dev/null
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java
@@ -0,0 +1,74 @@
+// 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.storage.queue.models.StorageErrorCode;
+import com.azure.storage.queue.models.StorageErrorException;
+
+import java.util.UUID;
+
+public class QueueExceptionSamples {
+    private static final String ACCOUNT_NAME = System.getenv("AZURE_STORAGE_ACCOUNT_NAME");
+    private static final String SAS_TOKEN = System.getenv("PRIMARY_SAS_TOKEN");
+
+    /**
+     * The main method shows how to handle the storage exception.
+     * @param args No args needed for the main method.
+     * @throws RuntimeException If queueServiceClient failed to create a queue.
+     */
+    public static void main(String[] args) {
+        // Create a queue service client.
+        String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", ACCOUNT_NAME, SAS_TOKEN);
+        QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).buildClient();
+
+        // Create queue client.
+        Response queueClientResponse;
+        try {
+            queueClientResponse = queueServiceClient.createQueue(generateRandomName("delete-not-exist", 16));
+            System.out.println("Successfully create the queue! Status code: " + String.valueOf(queueClientResponse.statusCode()));
+        } catch (StorageErrorException e) {
+            System.out.println(String.format("Error creating a queue. Error message: %s", e.value().message()));
+            throw new RuntimeException(e);
+        }
+        QueueClient queueClient = queueClientResponse.value();
+        queueClient.enqueueMessage("Hello, message 1!");
+        queueClient.enqueueMessage("Hello, message 2!");
+
+        // Delete message with wrong message id.
+        try {
+            queueClientResponse.value().dequeueMessages().forEach(
+                msg -> {
+                    queueClient.deleteMessage("wrong id", msg.popReceipt());
+                }
+            );
+        } catch (StorageErrorException e) {
+            if (e.getMessage().contains(StorageErrorCode.MESSAGE_NOT_FOUND.toString())) {
+                System.out.println("This is the error expected to throw");
+            } else {
+                System.out.println("This is not the error we expect!");
+            }
+        }
+
+        // Delete message with wrong pop receipt.
+        try {
+            queueClient.dequeueMessages().forEach(
+                msg -> {
+                    queueClient.deleteMessage(msg.messageId(), "Wrong Pop Receipt");
+                }
+            );
+        } catch (StorageErrorException e) {
+            if (e.getMessage().contains(StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE.toString())) {
+                System.out.println("This is the error expected to throw");
+            } else {
+                System.out.println("This is not the error we expect!");
+            }
+        }
+    }
+
+    private static String generateRandomName(String prefix, int length) {
+        int len = length > prefix.length() ? length - prefix.length() : 0;
+        return prefix + UUID.randomUUID().toString().substring(0, len);
+    }
+}
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSample.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSample.java
new file mode 100644
index 0000000000000..d52b845ae97e7
--- /dev/null
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSample.java
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue;
+
+import java.util.UUID;
+
+public class QueueServiceSample {
+    private static final String ACCOUNT_NAME = System.getenv("AZURE_STORAGE_ACCOUNT_NAME");
+    private static final String SAS_TOKEN = System.getenv("PRIMARY_SAS_TOKEN");
+
+    /**
+     * The main method illustrated the basic operations of creating and deleting queues using queue service sync client.
+     * @param args No args needed for main method.
+     */
+    public static void main(String[] args) {
+        // Build Queue Service Client using SAS Token
+        String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", ACCOUNT_NAME, SAS_TOKEN);
+        QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).buildClient();
+        queueServiceClient.createQueue(generateRandomName("create-queue", 16));
+
+        // Create another queue and list all queues, print the name and then delete the queue.
+        queueServiceClient.createQueue(generateRandomName("create-extra", 16));
+        queueServiceClient.listQueues().forEach(
+            queueItem -> {
+                System.out.println("The queue name is: " + queueItem.name());
+                queueServiceClient.deleteQueue(queueItem.name());
+            }
+        );
+    }
+
+    private static String generateRandomName(String prefix, int length) {
+        int len = length > prefix.length() ? length - prefix.length() : 0;
+        return prefix + UUID.randomUUID().toString().substring(0, len);
+    }
+
+}
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
new file mode 100644
index 0000000000000..e89f1d98a3bac
--- /dev/null
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
@@ -0,0 +1,285 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.storage.queue.javadoc;
+
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.VoidResponse;
+import com.azure.storage.common.credentials.SASTokenCredential;
+import com.azure.storage.common.credentials.SharedKeyCredential;
+import com.azure.storage.queue.QueueAsyncClient;
+import com.azure.storage.queue.QueueClient;
+import com.azure.storage.queue.QueueClientBuilder;
+import com.azure.storage.queue.models.EnqueuedMessage;
+import com.azure.storage.queue.models.UpdatedMessage;
+import java.time.Duration;
+
+/**
+ * Contains code snippets when generating javadocs through doclets for {@link QueueClient} and {@link QueueAsyncClient}.
+ */
+
+public class QueueJavaDocCodeSamples {
+    /**
+     * Generates code sample for creating a {@link QueueClient} with {@link QueueClient}
+     * @return An instance of {@link QueueClient}
+     */
+    public QueueClient createClientWithSASToken() {
+        // BEGIN: com.azure.storage.queue.queueClient.instantiation.sastoken
+        QueueClient queueClient = new QueueClientBuilder()
+            .endpoint("https://${accountName}.queue.core.windows.net?${SASToken}")
+            .buildClient();
+        // END: com.azure.storage.queue.queueClient.instantiation.sastoken
+        return queueClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueAsyncClient} with {@link SASTokenCredential}
+     * @return An instance of {@link QueueAsyncClient}
+     */
+    public QueueAsyncClient createAsyncClientWithSASToken() {
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.instantiation.sastoken
+        QueueAsyncClient queueAsyncClient = new QueueClientBuilder()
+            .endpoint("https://{accountName}.queue.core.windows.net?{SASToken}")
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueAsyncClient.instantiation.sastoken
+        return queueAsyncClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueClient} with {@code connectionString} which turns into {@link SharedKeyCredential}
+     * @return An instance of {@link QueueClient}
+     */
+    public QueueClient createClientWithConnectionString() {
+        // BEGIN: com.azure.storage.queue.queueClient.instantiation.connectionstring
+        String connectionString = "DefaultEndpointsProtocol=https;AccountName={name};"
+                    + "AccountKey={key};EndpointSuffix={core.windows.net}";
+        QueueClient queueClient = new QueueClientBuilder()
+            .connectionString(connectionString)
+            .buildClient();
+        // END: com.azure.storage.queue.queueClient.instantiation.connectionstring
+        return queueClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueAsyncClient} with {@code connectionString} which turns into {@link SharedKeyCredential}
+     * @return An instance of {@link QueueAsyncClient}
+     */
+    public QueueAsyncClient createAsyncClientWithConnectionString() {
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.instantiation.connectionstring
+        String connectionString = "DefaultEndpointsProtocol=https;AccountName={name};"
+                    + "AccountKey={key};EndpointSuffix={core.windows.net}";
+        QueueAsyncClient queueAsyncClient = new QueueClientBuilder()
+            .connectionString(connectionString)
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueAsyncClient.instantiation.connectionstring
+        return queueAsyncClient;
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#create()}
+     */
+    public void createQueue() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.create
+        VoidResponse response = queueClient.create();
+        System.out.println("Complete creating queue with status code: " + response.statusCode());
+        // END: com.azure.storage.queue.queueClient.create
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#create()}
+     */
+    public void createQueueAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.create
+        queueAsyncClient.create().subscribe(
+            response -> { },
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete creating the queue!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.create
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueClient#enqueueMessage(String)}
+     */
+    public void enqueueMessage() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.enqueueMessage#string
+        Response response = queueClient.enqueueMessage("hello msg");
+        System.out.println("Complete enqueuing the message with status code: " + response.statusCode());
+        // END: com.azure.storage.queue.queueClient.enqueueMessage#string
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#enqueueMessage(String)}
+     */
+    public void enqueueMessageAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string
+        queueAsyncClient.enqueueMessage("hello msg").subscribe(
+            response -> { },
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete enqueuing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#dequeueMessages()}
+     */
+    public void dequeueMessage() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.dequeueMessages
+        queueClient.dequeueMessages().forEach(
+            dequeuedMessage -> {
+                System.out.println("Complete dequeuing the message: " + dequeuedMessage.messageText());
+            }
+        );
+        // END: com.azure.storage.queue.queueClient.dequeueMessages
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#dequeueMessages()}
+     */
+    public void dequeueMessageAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.dequeueMessages
+        queueAsyncClient.dequeueMessages().subscribe(
+            dequeuedMessage -> System.out.println("The message got from dequeue operation: "
+                    + dequeuedMessage.messageText()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete dequeuing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.dequeueMessages
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#peekMessages()}
+     */
+    public void peekMessage() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.peekMessages
+        queueClient.peekMessages().forEach(
+            peekedMessage -> {
+                System.out.println("Complete peeking the message: " + peekedMessage.messageText());
+            }
+        );
+        // END: com.azure.storage.queue.queueClient.peekMessages
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#peekMessages()}
+     */
+    public void peekMessageAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.peekMessages
+        queueAsyncClient.peekMessages().subscribe(
+            peekMessages -> System.out.println("The message got from peek operation: " + peekMessages.messageText()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete peeking the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.peekMessages
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#updateMessage(String, String, String, Duration)}
+     */
+    public void updateMessage() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.updateMessage
+        queueClient.dequeueMessages().forEach(
+            dequeuedMessage -> {
+                Response response = queueClient.updateMessage("newText",
+                    dequeuedMessage.messageId(), dequeuedMessage.popReceipt(), null);
+                System.out.println("Complete updating the message with status code " + response.statusCode());
+            }
+        );
+        // END: com.azure.storage.queue.queueClient.updateMessage
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#updateMessage(String, String, String, Duration)}
+     */
+    public void updateMessageAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.updateMessage
+        queueAsyncClient.dequeueMessages().subscribe(
+            dequeuedMessage -> {
+                queueAsyncClient.updateMessage("newText", dequeuedMessage.messageId(),
+                    dequeuedMessage.popReceipt(), null).subscribe(
+                        response -> { },
+                        updateError -> System.err.print(updateError.toString()),
+                        () -> System.out.println("Complete updating the message!")
+                );
+            },
+            dequeueError -> System.err.print(dequeueError.toString()),
+            () -> System.out.println("Complete dequeueing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.updateMessage
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#deleteMessage(String, String)}
+     */
+    public void deleteMessage() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.deleteMessage
+        queueClient.dequeueMessages().forEach(
+            dequeuedMessage -> {
+                VoidResponse response = queueClient.deleteMessage(dequeuedMessage.messageId(),
+                    dequeuedMessage.popReceipt());
+                System.out.println("Complete deleting the message with status code " + response.statusCode());
+            }
+        );
+        // END: com.azure.storage.queue.queueClient.deleteMessage
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#deleteMessage(String, String)}
+     */
+    public void deleteMessageAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.deleteMessage
+        queueAsyncClient.dequeueMessages().subscribe(
+            dequeuedMessage -> {
+                queueAsyncClient.deleteMessage(dequeuedMessage.messageId(), dequeuedMessage.popReceipt()).subscribe(
+                    response -> { },
+                    deleteError -> System.err.print(deleteError.toString()),
+                    () -> System.out.println("Complete deleting the message!")
+                );
+            },
+            dequeueError -> System.err.print(dequeueError.toString()),
+            () -> System.out.println("Complete dequeueing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.deleteMessage
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#delete()}
+     */
+    public void deleteQueue() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.delete
+        VoidResponse response = queueClient.delete();
+        System.out.println("Complete deleting the queue with status code: " + response.statusCode());
+        // END: com.azure.storage.queue.queueClient.delete
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#delete()}
+     */
+    public void deleteQueueAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.delete
+        queueAsyncClient.delete().subscribe(
+            response -> System.out.println("Deleting the queue completed with status code: " + response.statusCode())
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.delete
+    }
+}
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
new file mode 100644
index 0000000000000..389fa6fe28b2a
--- /dev/null
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
@@ -0,0 +1,149 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.storage.queue.javadoc;
+
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.VoidResponse;
+import com.azure.storage.common.credentials.SASTokenCredential;
+import com.azure.storage.common.credentials.SharedKeyCredential;
+import com.azure.storage.queue.QueueClient;
+import com.azure.storage.queue.QueueServiceAsyncClient;
+import com.azure.storage.queue.QueueServiceClient;
+import com.azure.storage.queue.QueueServiceClientBuilder;
+
+/**
+ * Contains code snippets when generating javadocs through doclets for {@link QueueServiceClient} and {@link QueueServiceAsyncClient}.
+ */
+public class QueueServiceJavaDocCodeSamples {
+    /**
+     * Generates code sample for creating a {@link QueueServiceClient} with {@link QueueServiceClient}
+     * @return An instance of {@link QueueServiceClient}
+     */
+    public QueueServiceClient createClientWithSASToken() {
+        // BEGIN: com.azure.storage.queue.queueServiceClient.instantiation.sastoken
+        QueueServiceClient queueServiceClient = new QueueServiceClientBuilder()
+            .endpoint("https://${accountName}.queue.core.windows.net?${SASToken}")
+            .buildClient();
+        // END: com.azure.storage.queue.queueServiceClient.instantiation.sastoken
+        return queueServiceClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueServiceAsyncClient} with {@link SASTokenCredential}
+     * @return An instance of {@link QueueServiceAsyncClient}
+     */
+    public QueueServiceAsyncClient createAsyncClientWithSASToken() {
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.instantiation.sastoken
+        QueueServiceAsyncClient queueServiceAsyncClient = new QueueServiceClientBuilder()
+            .endpoint("https://{accountName}.queue.core.windows.net?{SASToken}")
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueServiceAsyncClient.instantiation.sastoken
+        return queueServiceAsyncClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueServiceClient} with {@code connectionString} which turns into {@link SharedKeyCredential}
+     * @return An instance of {@link QueueServiceClient}
+     */
+    public QueueServiceClient createClientWithConnectionString() {
+        // BEGIN: com.azure.storage.queue.queueServiceClient.instantiation.connectionstring
+        String connectionString = "DefaultEndpointsProtocol=https;AccountName={name};"
+                         + "AccountKey={key};EndpointSuffix={core.windows.net}";
+        QueueServiceClient queueServiceClient = new QueueServiceClientBuilder()
+            .connectionString(connectionString)
+            .buildClient();
+        // END: com.azure.storage.queue.queueServiceClient.instantiation.connectionstring
+        return queueServiceClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueServiceAsyncClient} with {@code connectionString} which turns into {@link SharedKeyCredential}
+     * @return An instance of {@link QueueServiceAsyncClient}
+     */
+    public QueueServiceAsyncClient createAsyncClientWithConnectionString() {
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.instantiation.connectionstring
+        String connectionString = "DefaultEndpointsProtocol=https;AccountName={name};"
+                        + "AccountKey={key};EndpointSuffix={core.windows.net}";
+        QueueServiceAsyncClient queueServiceAsyncClient = new QueueServiceClientBuilder()
+            .connectionString(connectionString)
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueServiceAsyncClient.instantiation.connectionstring
+        return queueServiceAsyncClient;
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#createQueue(String)}
+     */
+    public void createQueue() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.createQueue#string
+        Response response = queueServiceClient.createQueue("myqueue");
+        System.out.println("Complete creating queue with status code: " + response.statusCode());
+        // END: com.azure.storage.queue.queueServiceClient.createQueue#string
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#createQueue(String)}
+     */
+    public void createQueueAsync() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.createQueue#string
+        queueServiceAsyncClient.createQueue("myqueue").subscribe(
+            response -> { },
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete creating the queue!")
+        );
+        // END: com.azure.storage.queue.queueServiceAsyncClient.createQueue#string
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#listQueues()}
+     */
+    public void listQueues() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.listQueues
+        queueServiceClient.listQueues().forEach(
+            queueItem -> System.out.printf("Queue %s exists in the account", queueItem.name())
+        );
+        // END: com.azure.storage.queue.queueServiceClient.listQueues
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#listQueues()}
+     */
+    public void listQueuesAsync() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.listQueues
+        queueServiceAsyncClient.listQueues().subscribe(
+            queueItem -> System.out.printf("Queue %s exists in the account", queueItem.name()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete listing the queues!")
+        );
+        // END: com.azure.storage.queue.queueServiceAsyncClient.listQueues
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#deleteQueue(String)}
+     */
+    public void deleteQueue() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.deleteQueue#string
+        VoidResponse response = queueServiceClient.deleteQueue("myqueue");
+        System.out.println("Complete deleting the queue with status code: " + response.statusCode());
+        // END: com.azure.storage.queue.queueServiceClient.deleteQueue#string
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#deleteQueue(String)}
+     */
+    public void deleteQueueAsync() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.deleteQueue#string
+        queueServiceAsyncClient.deleteQueue("myshare").subscribe(
+            response -> System.out.println("Deleting the queue completed with status code: " + response.statusCode())
+        );
+        // END: com.azure.storage.queue.queueServiceAsyncClient.deleteQueue#string
+    }
+}
diff --git a/storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
new file mode 100644
index 0000000000000..a157ebffce34e
--- /dev/null
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
@@ -0,0 +1,695 @@
+// 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)
+                .endpoint(endpoint)
+                .queueName(queueName)
+                .httpClient(interceptorManager.getPlaybackClient())
+                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
+                .buildAsyncClient(), true, logger);
+        } else {
+            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
+                .connectionString(connectionString)
+                .endpoint(endpoint)
+                .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 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 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 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.sleep(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 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 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 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 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 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 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/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
new file mode 100644
index 0000000000000..fbfab6b397c51
--- /dev/null
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
@@ -0,0 +1,654 @@
+// 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)
+                .endpoint(endpoint)
+                .queueName(queueName)
+                .httpClient(interceptorManager.getPlaybackClient())
+                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
+                .buildClient(), true, logger);
+        } else {
+            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
+                .endpoint(endpoint)
+                .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 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 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 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.sleep(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 metadata = new HashMap<>();
+        metadata.put("metadata1", "value1");
+        metadata.put("metadata2", "value2");
+
+        helper.assertResponseStatusCode(client.create(metadata), 201);
+
+        Response 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 metadata = new HashMap<>();
+        metadata.put("metadata1", "value1");
+        metadata.put("metadata2", "value2");
+
+        helper.assertResponseStatusCode(client.create(), 201);
+
+        helper.assertResponseStatusCode(client.setMetadata(metadata), 204);
+
+        Response response = client.getProperties();
+        helper.assertResponseStatusCode(response, 200);
+        assertEquals(0, response.value().approximateMessagesCount());
+        assertEquals(metadata, response.value().metadata());
+    }
+
+    @Override
+    public void setMetadataQueueDoesNotExist() {
+        Map 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 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 metadata = new HashMap<>();
+        metadata.put("metadata1", "value1");
+        metadata.put("metadata2", "value2");
+
+        helper.assertResponseStatusCode(client.create(metadata), 201);
+
+        Response 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 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, 403);
+        }
+    }
+
+    @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 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 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 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 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.sleep(Duration.ofSeconds(5));
+        Iterator 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 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 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 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 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 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 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 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 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 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 response = client.dequeueMessages().iterator();
+        DequeuedMessage message = response.next();
+        assertEquals(messageText, message.messageText());
+        assertFalse(response.hasNext());
+
+        String updatedMessageText = "updated test message";
+        Response updatedMessageResponse = client.updateMessage(updatedMessageText, message.messageId(), message.popReceipt(), Duration.ofSeconds(1));
+        helper.assertResponseStatusCode(updatedMessageResponse, 204);
+
+        helper.sleep(Duration.ofSeconds(2));
+
+        Iterator 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 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 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/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java
new file mode 100644
index 0000000000000..b83d9a1459bbc
--- /dev/null
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java
@@ -0,0 +1,148 @@
+// 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/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java
new file mode 100644
index 0000000000000..8d0b89aa9be07
--- /dev/null
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java
@@ -0,0 +1,250 @@
+// 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)
+                .endpoint(endpoint)
+                .httpClient(interceptorManager.getPlaybackClient())
+                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
+                .buildAsyncClient(), true, logger);
+        } else {
+            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .endpoint(endpoint)
+                .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 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 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 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 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 metadata = new HashMap<>();
+        metadata.put("metadata1", "value1");
+        metadata.put("metadata2", "value2");
+
+        LinkedList 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 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 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)))
+            .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/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java
new file mode 100644
index 0000000000000..c6587872c6fb7
--- /dev/null
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java
@@ -0,0 +1,257 @@
+// 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)
+                .endpoint(endpoint)
+                .httpClient(interceptorManager.getPlaybackClient())
+                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
+                .buildClient(), true, logger);
+        } else {
+            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .endpoint(endpoint)
+                .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 response = client.enqueueMessage("Testing service client creating a queue");
+        helper.assertResponseStatusCode(response, 201);
+    }
+
+    @Override
+    public void createQueueWithMetadata() {
+        Map metadata = new HashMap<>();
+        metadata.put("metadata1", "value1");
+        metadata.put("metadata2", "value2");
+        QueueClient client = serviceClient.createQueue(queueName, metadata).value();
+
+        Response 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 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 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 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 metadata = new HashMap<>();
+        metadata.put("metadata1", "value1");
+        metadata.put("metadata2", "value2");
+
+        LinkedList 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 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 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 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/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java
new file mode 100644
index 0000000000000..3b86144d6f225
--- /dev/null
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java
@@ -0,0 +1,67 @@
+// 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();
+
+    // TODO (alzimmer): This test is off for now until we determine how to handle paging with limited results
+    //@Test
+    public abstract void listQueuesWithLimit();
+
+    @Test
+    public abstract void setProperties();
+
+    QueuesSegmentOptions defaultSegmentOptions() {
+        return new QueuesSegmentOptions().prefix(queueName);
+    }
+}
diff --git a/storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java b/storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java
new file mode 100644
index 0000000000000..d414f13d194dc
--- /dev/null
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java
@@ -0,0 +1,154 @@
+// 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 setupClient(BiFunction 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.asWarning().log("{} 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 expected, List 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 sleep(Duration duration) {
+        try {
+            Thread.sleep(duration.toMillis());
+        } catch (InterruptedException ex) {
+            // Ignore the errror
+        }
+    }
+}
diff --git a/storage/client/queue/src/test/resources/session-records/clearMessages.json b/storage/client/queue/src/test/resources/session-records/clearMessages.json
new file mode 100644
index 0000000000000..dab05b23fcfd5
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/clearMessages.json
@@ -0,0 +1,161 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222863-4003-0028-6775-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2228a8-4003-0028-1b75-37b82d000000",
+      "Body" : "23ac390a-a15c-4036-b933-506b593e817aWed, 10 Jul 2019 23:18:01 GMTWed, 17 Jul 2019 23:18:01 GMTAgAAAAMAAAAAAAAAeGrWt3U31QE=Wed, 10 Jul 2019 23:18:01 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2228d0-4003-0028-3a75-37b82d000000",
+      "Body" : "0820c842-8ea6-466f-801e-8fdb0240f573Wed, 10 Jul 2019 23:18:01 GMTWed, 17 Jul 2019 23:18:01 GMTAgAAAAMAAAAAAAAARoLet3U31QE=Wed, 10 Jul 2019 23:18:01 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2228f8-4003-0028-5975-37b82d000000",
+      "Body" : "1a2b254b-4f28-4dba-8a56-5947173e08faWed, 10 Jul 2019 23:18:01 GMTWed, 17 Jul 2019 23:18:01 GMTAgAAAAMAAAAAAAAA5kvmt3U31QE=Wed, 10 Jul 2019 23:18:01 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222917-4003-0028-7175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22292f-4003-0028-0775-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222940-4003-0028-1575-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22295c-4003-0028-2975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue39460410",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222973-4003-0028-3e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  } ],
+  "variables" : [ "queue39460410" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json
new file mode 100644
index 0000000000000..9fb11f03c6960
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue0499487b/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223222-4003-0028-3175-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd223222-4003-0028-3175-37b82d000000\nTime:2019-07-10T23:18:05.7976908Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue0499487b/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223243-4003-0028-4e75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd223243-4003-0028-4e75-37b82d000000\nTime:2019-07-10T23:18:05.8547315Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue0499487b" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createQueue.json b/storage/client/queue/src/test/resources/session-records/createQueue.json
new file mode 100644
index 0000000000000..51d4b6d64f5b5
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createQueue.json
@@ -0,0 +1,90 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue09262a67",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d29065a-6003-009e-2f76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue09262a67/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290667-6003-009e-3b76-37b6d5000000",
+      "Body" : "94fd0809-1708-49c0-91ea-d4cf2141af7fWed, 10 Jul 2019 23:24:47 GMTWed, 17 Jul 2019 23:24:47 GMTAgAAAAMAAAAAAAAAREDwqXY31QE=Wed, 10 Jul 2019 23:24:47 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue09262a67&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d29067f-6003-009e-5376-37b6d5000000",
+      "Body" : "queue09262a67queue09262a67",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue09262a67/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290694-6003-009e-6676-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue09262a67",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2906a1-6003-009e-7376-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT"
+    }
+  } ],
+  "variables" : [ "queue09262a67" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json b/storage/client/queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json
new file mode 100644
index 0000000000000..e7297afd23b18
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json
@@ -0,0 +1,90 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue2172697c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290a57-6003-009e-6676-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue2172697c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290a73-6003-009e-7e76-37b6d5000000",
+      "Body" : "QueueAlreadyExistsThe specified queue already exists.\nRequestId:0d290a73-6003-009e-7e76-37b6d5000000\nTime:2019-07-10T23:24:49.9481623Z",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue2172697c&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290a84-6003-009e-0f76-37b6d5000000",
+      "Body" : "queue2172697cqueue2172697c",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue2172697c/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290a9d-6003-009e-2776-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue2172697c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290aa4-6003-009e-2d76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  } ],
+  "variables" : [ "queue2172697c" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json b/storage/client/queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json
new file mode 100644
index 0000000000000..5f637cb224b88
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json
@@ -0,0 +1,125 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue3315117d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d29094b-6003-009e-0a76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue3315117d/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d29096a-6003-009e-2176-37b6d5000000",
+      "Body" : "e59cbb06-dc9a-4fd8-89c9-a62bec05127eWed, 10 Jul 2019 23:24:49 GMTWed, 17 Jul 2019 23:24:49 GMTAgAAAAMAAAAAAAAAh80Wq3Y31QE=Wed, 10 Jul 2019 23:24:49 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue3315117d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290979-6003-009e-2d76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue3315117d/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d29099f-6003-009e-4b76-37b6d5000000",
+      "Body" : "e59cbb06-dc9a-4fd8-89c9-a62bec05127eWed, 10 Jul 2019 23:24:49 GMTWed, 17 Jul 2019 23:24:49 GMT0Testing service client creating the same queue twice does not modify the queue",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue3315117d&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d2909d4-6003-009e-7a76-37b6d5000000",
+      "Body" : "queue3315117dqueue3315117d",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue3315117d/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2909eb-6003-009e-0e76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue3315117d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2909f9-6003-009e-1b76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  } ],
+  "variables" : [ "queue3315117d" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createQueueWithMetadata.json b/storage/client/queue/src/test/resources/session-records/createQueueWithMetadata.json
new file mode 100644
index 0000000000000..3c8381cb87770
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createQueueWithMetadata.json
@@ -0,0 +1,91 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue2741227a",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290770-6003-009e-1d76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue2741227a?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290788-6003-009e-3176-37b6d5000000",
+      "x-ms-meta-metadata2" : "value2",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue2741227a&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d2907ab-6003-009e-4e76-37b6d5000000",
+      "Body" : "queue2741227aqueue2741227a",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue2741227a/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2907b9-6003-009e-5976-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue2741227a",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2907c4-6003-009e-6276-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  } ],
+  "variables" : [ "queue2741227a" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createTwiceDifferentMetadata.json b/storage/client/queue/src/test/resources/session-records/createTwiceDifferentMetadata.json
new file mode 100644
index 0000000000000..2c1103e32db9c
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createTwiceDifferentMetadata.json
@@ -0,0 +1,71 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue0432116e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226070-4003-0028-4675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue0432116e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22608d-4003-0028-5f75-37b82d000000",
+      "Body" : "QueueAlreadyExistsThe specified queue already exists.\nRequestId:dd22608d-4003-0028-5f75-37b82d000000\nTime:2019-07-10T23:18:38.0176580Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue0432116e/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22609f-4003-0028-7175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue0432116e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2260a4-4003-0028-7675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT"
+    }
+  } ],
+  "variables" : [ "queue0432116e" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createTwiceSameMetadata.json b/storage/client/queue/src/test/resources/session-records/createTwiceSameMetadata.json
new file mode 100644
index 0000000000000..67e8f6692f9ce
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createTwiceSameMetadata.json
@@ -0,0 +1,68 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue1490420b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225ee9-4003-0028-6675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue1490420b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225f04-4003-0028-7875-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue1490420b/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225f21-4003-0028-1175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue1490420b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225f32-4003-0028-2175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  } ],
+  "variables" : [ "queue1490420b" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createWithMetadata.json b/storage/client/queue/src/test/resources/session-records/createWithMetadata.json
new file mode 100644
index 0000000000000..e81225ed944ad
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createWithMetadata.json
@@ -0,0 +1,72 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue98908a15",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2231c8-4003-0028-6375-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue98908a15?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2231df-4003-0028-7475-37b82d000000",
+      "x-ms-meta-metadata2" : "value2",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue98908a15/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2231f6-4003-0028-0975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue98908a15",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223209-4003-0028-1b75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  } ],
+  "variables" : [ "queue98908a15" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createWithSASToken.json b/storage/client/queue/src/test/resources/session-records/createWithSASToken.json
new file mode 100644
index 0000000000000..b0f0da481c199
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createWithSASToken.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue99626420/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222843-4003-0028-5275-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd222843-4003-0028-5275-37b82d000000\nTime:2019-07-10T23:18:01.0102891Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue99626420" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/createWithSharedKey.json b/storage/client/queue/src/test/resources/session-records/createWithSharedKey.json
new file mode 100644
index 0000000000000..45ad59b25dadb
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/createWithSharedKey.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue46849fbc/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226200-4003-0028-1275-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd226200-4003-0028-1275-37b82d000000\nTime:2019-07-10T23:18:39.1594759Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue46849fbc" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteExisting.json b/storage/client/queue/src/test/resources/session-records/deleteExisting.json
new file mode 100644
index 0000000000000..ffaa890d17294
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteExisting.json
@@ -0,0 +1,94 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue69325b7f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223362-4003-0028-4f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue69325b7f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd223387-4003-0028-7075-37b82d000000",
+      "Body" : "23c03c48-1eb9-48c9-aded-b6c6adb39e9eWed, 10 Jul 2019 23:18:06 GMTWed, 17 Jul 2019 23:18:06 GMTAgAAAAMAAAAAAAAA1NHmunU31QE=Wed, 10 Jul 2019 23:18:06 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue69325b7f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223398-4003-0028-0175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue69325b7f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd225eb4-4003-0028-3c75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd225eb4-4003-0028-3c75-37b82d000000\nTime:2019-07-10T23:18:36.4715552Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue69325b7f/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225ecd-4003-0028-5175-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd225ecd-4003-0028-5175-37b82d000000\nTime:2019-07-10T23:18:36.5175891Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue69325b7f" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteExistingQueue.json b/storage/client/queue/src/test/resources/session-records/deleteExistingQueue.json
new file mode 100644
index 0000000000000..414ed34da046c
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteExistingQueue.json
@@ -0,0 +1,75 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue15727eac",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290577-6003-009e-6976-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:46 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue15727eac",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2905e7-6003-009e-4776-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:46 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue15727eac/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290618-6003-009e-7176-37b6d5000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:0d290618-6003-009e-7176-37b6d5000000\nTime:2019-07-10T23:24:47.1091308Z",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue15727eac&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290643-6003-009e-1b76-37b6d5000000",
+      "Body" : "queue15727eac",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue15727eac" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteMessage.json b/storage/client/queue/src/test/resources/session-records/deleteMessage.json
new file mode 100644
index 0000000000000..4682bf4a1a131
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteMessage.json
@@ -0,0 +1,124 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue1154048f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226162-4003-0028-1e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue1154048f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd226172-4003-0028-2a75-37b82d000000",
+      "Body" : "5d20d094-2ec7-4544-9ad1-86fc3aa14140Wed, 10 Jul 2019 23:18:38 GMTWed, 17 Jul 2019 23:18:38 GMTAgAAAAMAAAAAAAAAskA9znU31QE=Wed, 10 Jul 2019 23:18:38 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue1154048f/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd226183-4003-0028-3675-37b82d000000",
+      "Body" : "5d20d094-2ec7-4544-9ad1-86fc3aa14140Wed, 10 Jul 2019 23:18:38 GMTWed, 17 Jul 2019 23:18:38 GMTAgAAAAMAAAAAAAAAOIYm4HU31QE=Wed, 10 Jul 2019 23:19:08 GMT1test message",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue1154048f/messages/5d20d094-2ec7-4544-9ad1-86fc3aa14140?popreceipt=AgAAAAMAAAAAAAAAOIYm4HU31QE%3d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226190-4003-0028-3f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue1154048f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2261a5-4003-0028-4e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue1154048f/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2261ba-4003-0028-5e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue1154048f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2261ce-4003-0028-6c75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  } ],
+  "variables" : [ "queue1154048f" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json b/storage/client/queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json
new file mode 100644
index 0000000000000..4eccb534a46f3
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json
@@ -0,0 +1,109 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue96938aad",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221ea5-4003-0028-1075-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue96938aad/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd221eb9-4003-0028-2375-37b82d000000",
+      "Body" : "17aa480c-b8aa-47ce-9fdb-753a00853819Wed, 10 Jul 2019 23:17:54 GMTWed, 17 Jul 2019 23:17:54 GMTAgAAAAMAAAAAAAAALPXXs3U31QE=Wed, 10 Jul 2019 23:17:54 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:17:54 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue96938aad/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd221ecb-4003-0028-3575-37b82d000000",
+      "Body" : "17aa480c-b8aa-47ce-9fdb-753a00853819Wed, 10 Jul 2019 23:17:54 GMTWed, 17 Jul 2019 23:17:54 GMTAgAAAAMAAAAAAAAA4IjBxXU31QE=Wed, 10 Jul 2019 23:18:24 GMT1test message",
+      "Date" : "Wed, 10 Jul 2019 23:17:54 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue96938aad/messages/17aa480c-b8aa-47ce-9fdb-753a00853819random?popreceipt=AgAAAAMAAAAAAAAA4IjBxXU31QE%3d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221ee5-4003-0028-4d75-37b82d000000",
+      "Body" : "MessageNotFoundThe specified message does not exist.\nRequestId:dd221ee5-4003-0028-4d75-37b82d000000\nTime:2019-07-10T23:17:54.6327585Z",
+      "Date" : "Wed, 10 Jul 2019 23:17:54 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue96938aad/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221ef8-4003-0028-5f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:54 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue96938aad",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221f17-4003-0028-7c75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:54 GMT"
+    }
+  } ],
+  "variables" : [ "queue96938aad" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json b/storage/client/queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json
new file mode 100644
index 0000000000000..01154b0b743de
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json
@@ -0,0 +1,109 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue67327535",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221e11-4003-0028-0575-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue67327535/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd221e1c-4003-0028-0f75-37b82d000000",
+      "Body" : "a848cec9-d421-43a6-ac39-6a941d76d21bWed, 10 Jul 2019 23:17:54 GMTWed, 17 Jul 2019 23:17:54 GMTAgAAAAMAAAAAAAAAJDmgs3U31QE=Wed, 10 Jul 2019 23:17:54 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue67327535/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd221e2b-4003-0028-1e75-37b82d000000",
+      "Body" : "a848cec9-d421-43a6-ac39-6a941d76d21bWed, 10 Jul 2019 23:17:54 GMTWed, 17 Jul 2019 23:17:54 GMTAgAAAAMAAAAAAAAANWmKxXU31QE=Wed, 10 Jul 2019 23:18:24 GMT1test message",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue67327535/messages/a848cec9-d421-43a6-ac39-6a941d76d21b?popreceipt=AgAAAAMAAAAAAAAANWmKxXU31QE%3drandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221e4c-4003-0028-3c75-37b82d000000",
+      "Body" : "InvalidQueryParameterValueValue for one of the query parameters specified in the request URI is invalid.\nRequestId:dd221e4c-4003-0028-3c75-37b82d000000\nTime:2019-07-10T23:17:54.2735030ZpopreceiptAgAAAAMAAAAAAAAANWmKxXU31QE=randomInvalid pop receipt format",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue67327535/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221e6a-4003-0028-5575-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue67327535",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221e7b-4003-0028-6675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT"
+    }
+  } ],
+  "variables" : [ "queue67327535" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json
new file mode 100644
index 0000000000000..c03dedb5c4887
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue055108e6/messages/invalid?popreceipt=call",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226381-4003-0028-5575-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd226381-4003-0028-5575-37b82d000000\nTime:2019-07-10T23:18:40.1101585Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue055108e6/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226390-4003-0028-6375-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd226390-4003-0028-6375-37b82d000000\nTime:2019-07-10T23:18:40.1591931Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue055108e6" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteMetadata.json b/storage/client/queue/src/test/resources/session-records/deleteMetadata.json
new file mode 100644
index 0000000000000..8ba83a6d8d215
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteMetadata.json
@@ -0,0 +1,106 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue679519e2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2263ff-4003-0028-4975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue679519e2?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226409-4003-0028-5275-37b82d000000",
+      "x-ms-meta-metadata2" : "value2",
+      "Date" : "Wed, 10 Jul 2019 23:18:40 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue679519e2?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226418-4003-0028-6075-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:40 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue679519e2?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226420-4003-0028-6875-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:40 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue679519e2/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226434-4003-0028-7b75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:40 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue679519e2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22644c-4003-0028-1275-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:40 GMT"
+    }
+  } ],
+  "variables" : [ "queue679519e2" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteNonExistent.json b/storage/client/queue/src/test/resources/session-records/deleteNonExistent.json
new file mode 100644
index 0000000000000..2fa6701c17acb
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteNonExistent.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue04551c5d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226108-4003-0028-4e75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd226108-4003-0028-4e75-37b82d000000\nTime:2019-07-10T23:18:38.4209499Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue04551c5d/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226119-4003-0028-5e75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd226119-4003-0028-5e75-37b82d000000\nTime:2019-07-10T23:18:38.4689812Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue04551c5d" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/deleteNonExistentQueue.json b/storage/client/queue/src/test/resources/session-records/deleteNonExistentQueue.json
new file mode 100644
index 0000000000000..bf9105b3ccdc4
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/deleteNonExistentQueue.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue82016a1d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290bd9-6003-009e-4476-37b6d5000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:0d290bd9-6003-009e-4476-37b6d5000000\nTime:2019-07-10T23:24:50.9128531Z",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue82016a1d&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290bf6-6003-009e-5b76-37b6d5000000",
+      "Body" : "queue82016a1d",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue82016a1d" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/dequeueMessage.json b/storage/client/queue/src/test/resources/session-records/dequeueMessage.json
new file mode 100644
index 0000000000000..6473031c5a50f
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/dequeueMessage.json
@@ -0,0 +1,90 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue679346d1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221d34-4003-0028-3d75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:52 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue679346d1/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd221d8c-4003-0028-0a75-37b82d000000",
+      "Body" : "b6c999ca-9091-4109-b579-c4bca39d216dWed, 10 Jul 2019 23:17:53 GMTWed, 17 Jul 2019 23:17:53 GMTAgAAAAMAAAAAAAAA9bc/s3U31QE=Wed, 10 Jul 2019 23:17:53 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue679346d1/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd221da4-4003-0028-2275-37b82d000000",
+      "Body" : "b6c999ca-9091-4109-b579-c4bca39d216dWed, 10 Jul 2019 23:17:53 GMTWed, 17 Jul 2019 23:17:53 GMTAgAAAAMAAAAAAAAA11EwxXU31QE=Wed, 10 Jul 2019 23:18:23 GMT1test message",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue679346d1/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221da9-4003-0028-2775-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue679346d1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221db5-4003-0028-3275-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT"
+    }
+  } ],
+  "variables" : [ "queue679346d1" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/dequeueMultipleMessages.json b/storage/client/queue/src/test/resources/session-records/dequeueMultipleMessages.json
new file mode 100644
index 0000000000000..104a637b766db
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/dequeueMultipleMessages.json
@@ -0,0 +1,109 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue6570759e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226228-4003-0028-2f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue6570759e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd22623f-4003-0028-4475-37b82d000000",
+      "Body" : "3d48ff69-e261-4bea-839c-ca0edfc2af4cWed, 10 Jul 2019 23:18:39 GMTWed, 17 Jul 2019 23:18:39 GMTAgAAAAMAAAAAAAAAYwGHznU31QE=Wed, 10 Jul 2019 23:18:39 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue6570759e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd226254-4003-0028-5375-37b82d000000",
+      "Body" : "fd6a25b1-b3d3-4743-b5b3-072add1a4a86Wed, 10 Jul 2019 23:18:39 GMTWed, 17 Jul 2019 23:18:39 GMTAgAAAAMAAAAAAAAAz3yOznU31QE=Wed, 10 Jul 2019 23:18:39 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue6570759e/messages?numofmessages=2&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd226269-4003-0028-6475-37b82d000000",
+      "Body" : "3d48ff69-e261-4bea-839c-ca0edfc2af4cWed, 10 Jul 2019 23:18:39 GMTWed, 17 Jul 2019 23:18:39 GMTAgAAAAMAAAAAAAAAWsJ34HU31QE=Wed, 10 Jul 2019 23:19:09 GMT1test messagefd6a25b1-b3d3-4743-b5b3-072add1a4a86Wed, 10 Jul 2019 23:18:39 GMTWed, 17 Jul 2019 23:18:39 GMTAgAAAAMAAAAAAAAAWsJ34HU31QE=Wed, 10 Jul 2019 23:19:09 GMT1test message 2",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue6570759e/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226296-4003-0028-0975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue6570759e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2262a9-4003-0028-1975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  } ],
+  "variables" : [ "queue6570759e" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json
new file mode 100644
index 0000000000000..3bef9c37aaf6e
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue39822dce/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2260e6-4003-0028-3075-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd2260e6-4003-0028-3075-37b82d000000\nTime:2019-07-10T23:18:38.3148712Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue39822dce/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2260f8-4003-0028-4175-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd2260f8-4003-0028-4175-37b82d000000\nTime:2019-07-10T23:18:38.3619056Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue39822dce" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/dequeueTooManyMessages.json b/storage/client/queue/src/test/resources/session-records/dequeueTooManyMessages.json
new file mode 100644
index 0000000000000..757caa567efa5
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/dequeueTooManyMessages.json
@@ -0,0 +1,71 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue03015bde",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2226b1-4003-0028-0675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue03015bde/messages?numofmessages=64&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2226cd-4003-0028-1d75-37b82d000000",
+      "Body" : "OutOfRangeQueryParameterValueOne of the query parameters specified in the request URI is outside the permissible range.\nRequestId:dd2226cd-4003-0028-1d75-37b82d000000\nTime:2019-07-10T23:18:00.2767678Znumofmessages64132",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue03015bde/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2226e0-4003-0028-2e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue03015bde",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2226fd-4003-0028-4a75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT"
+    }
+  } ],
+  "variables" : [ "queue03015bde" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/enqueueEmptyMessage.json b/storage/client/queue/src/test/resources/session-records/enqueueEmptyMessage.json
new file mode 100644
index 0000000000000..ed0aaef6517fc
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/enqueueEmptyMessage.json
@@ -0,0 +1,90 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue76420ef8",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2262ce-4003-0028-3475-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue76420ef8/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2262e1-4003-0028-4275-37b82d000000",
+      "Body" : "e1efc34f-03c7-4037-9597-6955381e8889Wed, 10 Jul 2019 23:18:39 GMTWed, 17 Jul 2019 23:18:39 GMTAgAAAAMAAAAAAAAAl6+7znU31QE=Wed, 10 Jul 2019 23:18:39 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue76420ef8/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2262ef-4003-0028-5075-37b82d000000",
+      "Body" : "e1efc34f-03c7-4037-9597-6955381e8889Wed, 10 Jul 2019 23:18:39 GMTWed, 17 Jul 2019 23:18:39 GMT0",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue76420ef8/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2262fe-4003-0028-5e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue76420ef8",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22630f-4003-0028-6f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  } ],
+  "variables" : [ "queue76420ef8" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/enqueueMessage.json b/storage/client/queue/src/test/resources/session-records/enqueueMessage.json
new file mode 100644
index 0000000000000..ff3e72aedaacf
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/enqueueMessage.json
@@ -0,0 +1,90 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue17032768",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222a23-4003-0028-4b75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue17032768/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222a4a-4003-0028-6c75-37b82d000000",
+      "Body" : "7422f1b3-c1b1-4385-a945-6365e2e01caaWed, 10 Jul 2019 23:18:01 GMTWed, 17 Jul 2019 23:18:01 GMTAgAAAAMAAAAAAAAAQm1FuHU31QE=Wed, 10 Jul 2019 23:18:01 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue17032768/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222a74-4003-0028-1275-37b82d000000",
+      "Body" : "7422f1b3-c1b1-4385-a945-6365e2e01caaWed, 10 Jul 2019 23:18:01 GMTWed, 17 Jul 2019 23:18:01 GMT0test message",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue17032768/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222aa3-4003-0028-3975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue17032768",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222ac4-4003-0028-5675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  } ],
+  "variables" : [ "queue17032768" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json
new file mode 100644
index 0000000000000..9433eea40c38b
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json
@@ -0,0 +1,43 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue39910e47/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2229a6-4003-0028-6475-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd2229a6-4003-0028-6475-37b82d000000\nTime:2019-07-10T23:18:01.6777634Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue39910e47/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2229bd-4003-0028-7575-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd2229bd-4003-0028-7575-37b82d000000\nTime:2019-07-10T23:18:01.7277985Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue39910e47" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json b/storage/client/queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json
new file mode 100644
index 0000000000000..bb6b2172664f2
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json
@@ -0,0 +1,90 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue69359315",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221f37-4003-0028-1c75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:54 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue69359315/messages?visibilitytimeout=0&messagettl=2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd221f43-4003-0028-2775-37b82d000000",
+      "Body" : "c96e7db1-1d4a-4743-b165-a5835968722aWed, 10 Jul 2019 23:17:54 GMTWed, 10 Jul 2019 23:17:56 GMTAgAAAAMAAAAAAAAApcYOtHU31QE=Wed, 10 Jul 2019 23:17:54 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:17:54 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue69359315/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222634-4003-0028-1675-37b82d000000",
+      "Body" : "",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue69359315/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22264c-4003-0028-2c75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue69359315",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222666-4003-0028-4375-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT"
+    }
+  } ],
+  "variables" : [ "queue69359315" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/getAccessPolicy.json b/storage/client/queue/src/test/resources/session-records/getAccessPolicy.json
new file mode 100644
index 0000000000000..79f9317b619d1
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/getAccessPolicy.json
@@ -0,0 +1,71 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue276184e3",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222bac-4003-0028-2175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue276184e3?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222bc0-4003-0028-3175-37b82d000000",
+      "Body" : "",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue276184e3/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222be3-4003-0028-4d75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue276184e3",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222bfe-4003-0028-6375-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT"
+    }
+  } ],
+  "variables" : [ "queue276184e3" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json
new file mode 100644
index 0000000000000..8c772f655188e
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue66823709?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22604d-4003-0028-2a75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd22604d-4003-0028-2a75-37b82d000000\nTime:2019-07-10T23:18:37.8315254Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue66823709/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226056-4003-0028-3275-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd226056-4003-0028-3275-37b82d000000\nTime:2019-07-10T23:18:37.8795608Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue66823709" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/getProperties.json b/storage/client/queue/src/test/resources/session-records/getProperties.json
new file mode 100644
index 0000000000000..a7c0a0ec5332d
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/getProperties.json
@@ -0,0 +1,72 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue36601253",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2227b8-4003-0028-6075-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue36601253?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2227d1-4003-0028-7675-37b82d000000",
+      "x-ms-meta-metadata2" : "value2",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue36601253/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2227f9-4003-0028-1775-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue36601253",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222807-4003-0028-2575-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  } ],
+  "variables" : [ "queue36601253" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json
new file mode 100644
index 0000000000000..fe98b22946df5
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue7527481d?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222681-4003-0028-5b75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd222681-4003-0028-5b75-37b82d000000\nTime:2019-07-10T23:18:00.1126512Z",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue7527481d/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22269d-4003-0028-7375-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd22269d-4003-0028-7375-37b82d000000\nTime:2019-07-10T23:18:00.1626872Z",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue7527481d" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json b/storage/client/queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json
new file mode 100644
index 0000000000000..7776d4fed4783
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json
@@ -0,0 +1,43 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue48695d7f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290a18-6003-009e-3676-37b6d5000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:0d290a18-6003-009e-3676-37b6d5000000\nTime:2019-07-10T23:24:49.7390111Z",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue48695d7f&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290a2f-6003-009e-4876-37b6d5000000",
+      "Body" : "queue48695d7f",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue48695d7f" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/listQueues.json b/storage/client/queue/src/test/resources/session-records/listQueues.json
new file mode 100644
index 0000000000000..361f47abd400a
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/listQueues.json
@@ -0,0 +1,186 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b60",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2907f4-6003-009e-0976-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b61",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290805-6003-009e-1376-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b62",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d29080b-6003-009e-1876-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue455724b6&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290816-6003-009e-2276-37b6d5000000",
+      "Body" : "queue455724b6queue455724b60queue455724b61queue455724b62",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue455724b6&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d29083e-6003-009e-4676-37b6d5000000",
+      "Body" : "queue455724b6queue455724b60queue455724b61queue455724b62",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b60/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290871-6003-009e-6e76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b60",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290896-6003-009e-0676-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b61/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2908bc-6003-009e-2476-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b61",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2908df-6003-009e-3e76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b62/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d2908fd-6003-009e-5676-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue455724b62",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d29091f-6003-009e-6a76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:49 GMT"
+    }
+  } ],
+  "variables" : [ "queue455724b6" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/listQueuesIncludeMetadata.json b/storage/client/queue/src/test/resources/session-records/listQueuesIncludeMetadata.json
new file mode 100644
index 0000000000000..a0e836cf26701
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/listQueuesIncludeMetadata.json
@@ -0,0 +1,186 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae80",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290c20-6003-009e-7b76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae81",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290c34-6003-009e-0a76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae82",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290c4e-6003-009e-1f76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue58738ae8&include=metadata&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290c6b-6003-009e-3376-37b6d5000000",
+      "Body" : "queue58738ae8queue58738ae80value1value2queue58738ae81queue58738ae82value1value2",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue58738ae8&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290c8e-6003-009e-5176-37b6d5000000",
+      "Body" : "queue58738ae8queue58738ae80queue58738ae81queue58738ae82",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae80/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290caa-6003-009e-6876-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae80",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290cc1-6003-009e-7a76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae81/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290cde-6003-009e-1176-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae81",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290cf2-6003-009e-2376-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae82/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290d14-6003-009e-4076-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue58738ae82",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290d2b-6003-009e-5476-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:51 GMT"
+    }
+  } ],
+  "variables" : [ "queue58738ae8" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/listQueuesWithPrefix.json b/storage/client/queue/src/test/resources/session-records/listQueuesWithPrefix.json
new file mode 100644
index 0000000000000..ff107058e29fc
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/listQueuesWithPrefix.json
@@ -0,0 +1,186 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382efprefix0",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290acd-6003-009e-5476-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382ef1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290ae3-6003-009e-6876-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382efprefix2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290afd-6003-009e-8076-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue423382efprefix&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290b0d-6003-009e-0f76-37b6d5000000",
+      "Body" : "queue423382efprefixqueue423382efprefix0queue423382efprefix2",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue423382ef&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290b16-6003-009e-1776-37b6d5000000",
+      "Body" : "queue423382efqueue423382ef1queue423382efprefix0queue423382efprefix2",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382ef1/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290b38-6003-009e-3576-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382ef1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290b4c-6003-009e-4776-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382efprefix0/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290b60-6003-009e-5976-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382efprefix0",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290b71-6003-009e-6676-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382efprefix2/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290b81-6003-009e-7576-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue423382efprefix2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "0d290b9a-6003-009e-0b76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:50 GMT"
+    }
+  } ],
+  "variables" : [ "queue423382ef" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/peekMessage.json b/storage/client/queue/src/test/resources/session-records/peekMessage.json
new file mode 100644
index 0000000000000..540c460785a11
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/peekMessage.json
@@ -0,0 +1,90 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue54577e60",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225fa8-4003-0028-0d75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue54577e60/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd225fb8-4003-0028-1c75-37b82d000000",
+      "Body" : "53096a37-63bf-45d9-9172-4c8713ff282eWed, 10 Jul 2019 23:18:37 GMTWed, 17 Jul 2019 23:18:37 GMTAgAAAAMAAAAAAAAATsJgzXU31QE=Wed, 10 Jul 2019 23:18:37 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue54577e60/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd225fd2-4003-0028-3375-37b82d000000",
+      "Body" : "53096a37-63bf-45d9-9172-4c8713ff282eWed, 10 Jul 2019 23:18:37 GMTWed, 17 Jul 2019 23:18:37 GMT0test message",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue54577e60/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225fe6-4003-0028-4775-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue54577e60",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225ff7-4003-0028-5875-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT"
+    }
+  } ],
+  "variables" : [ "queue54577e60" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/peekMultipleMessages.json b/storage/client/queue/src/test/resources/session-records/peekMultipleMessages.json
new file mode 100644
index 0000000000000..5ea0a89b15f98
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/peekMultipleMessages.json
@@ -0,0 +1,109 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue17925938",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222afc-4003-0028-0875-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue17925938/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222b1e-4003-0028-2375-37b82d000000",
+      "Body" : "86c3b192-2c4f-4bd4-89bf-07553c141ac0Wed, 10 Jul 2019 23:18:02 GMTWed, 17 Jul 2019 23:18:02 GMTAgAAAAMAAAAAAAAAI8dyuHU31QE=Wed, 10 Jul 2019 23:18:02 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue17925938/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222b4a-4003-0028-4775-37b82d000000",
+      "Body" : "1b2d50b7-3540-4dd4-a480-8549b5207fe7Wed, 10 Jul 2019 23:18:02 GMTWed, 17 Jul 2019 23:18:02 GMTAgAAAAMAAAAAAAAAqWl6uHU31QE=Wed, 10 Jul 2019 23:18:02 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue17925938/messages?numofmessages=2&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222b67-4003-0028-6175-37b82d000000",
+      "Body" : "86c3b192-2c4f-4bd4-89bf-07553c141ac0Wed, 10 Jul 2019 23:18:02 GMTWed, 17 Jul 2019 23:18:02 GMT0test message1b2d50b7-3540-4dd4-a480-8549b5207fe7Wed, 10 Jul 2019 23:18:02 GMTWed, 17 Jul 2019 23:18:02 GMT0test message 2",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue17925938/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222b7e-4003-0028-7675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue17925938",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222b8e-4003-0028-0675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT"
+    }
+  } ],
+  "variables" : [ "queue17925938" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/peekQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/peekQueueDoesNotExist.json
new file mode 100644
index 0000000000000..c9de737c16179
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/peekQueueDoesNotExist.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue5442745c/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221dd8-4003-0028-5075-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd221dd8-4003-0028-5075-37b82d000000\nTime:2019-07-10T23:17:53.9252561Z",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue5442745c/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd221df7-4003-0028-6d75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd221df7-4003-0028-6d75-37b82d000000\nTime:2019-07-10T23:17:54.0093158Z",
+      "Date" : "Wed, 10 Jul 2019 23:17:53 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue5442745c" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/peekTooManyMessages.json b/storage/client/queue/src/test/resources/session-records/peekTooManyMessages.json
new file mode 100644
index 0000000000000..f653e97e1e0ce
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/peekTooManyMessages.json
@@ -0,0 +1,71 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue80227035",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22612f-4003-0028-7275-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue80227035/messages?numofmessages=64&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226138-4003-0028-7a75-37b82d000000",
+      "Body" : "OutOfRangeQueryParameterValueOne of the query parameters specified in the request URI is outside the permissible range.\nRequestId:dd226138-4003-0028-7a75-37b82d000000\nTime:2019-07-10T23:18:38.5780592Znumofmessages64132",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue80227035/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22613d-4003-0028-7f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue80227035",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226149-4003-0028-0975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:38 GMT"
+    }
+  } ],
+  "variables" : [ "queue80227035" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setAccessPolicy.json b/storage/client/queue/src/test/resources/session-records/setAccessPolicy.json
new file mode 100644
index 0000000000000..ac6e9881a669f
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setAccessPolicy.json
@@ -0,0 +1,88 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue656812ca",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225f53-4003-0028-4075-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue656812ca?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd225f6a-4003-0028-5575-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue656812ca?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd225f7e-4003-0028-6675-37b82d000000",
+      "Body" : "testpermission2000-01-01T00:00:00.0000000Z2020-01-01T00:00:00.0000000Zraup",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue656812ca/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225f8c-4003-0028-7475-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue656812ca",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd225f98-4003-0028-7e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:36 GMT"
+    }
+  } ],
+  "variables" : [ "queue656812ca" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json
new file mode 100644
index 0000000000000..b2b42bce18c37
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json
@@ -0,0 +1,43 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue01052e33?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd22645d-4003-0028-2375-37b82d000000",
+      "Body" : "InvalidXmlDocumentXML specified is not syntactically valid.\nRequestId:dd22645d-4003-0028-2375-37b82d000000\nTime:2019-07-10T23:18:40.8086534Z00",
+      "Date" : "Wed, 10 Jul 2019 23:18:40 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue01052e33/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22646a-4003-0028-2f75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd22646a-4003-0028-2f75-37b82d000000\nTime:2019-07-10T23:18:40.8566884Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:40 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue01052e33" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setInvalidAccessPolicy.json b/storage/client/queue/src/test/resources/session-records/setInvalidAccessPolicy.json
new file mode 100644
index 0000000000000..fe186f2b4ac1c
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setInvalidAccessPolicy.json
@@ -0,0 +1,72 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue424460ef",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226338-4003-0028-1475-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue424460ef?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd22634c-4003-0028-2575-37b82d000000",
+      "Body" : "InvalidXmlDocumentXML specified is not syntactically valid.\nRequestId:dd22634c-4003-0028-2575-37b82d000000\nTime:2019-07-10T23:18:39.9250246Z1304Signed identifier ID cannot be empty or over 64 characters in length",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue424460ef/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22635d-4003-0028-3675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue424460ef",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226363-4003-0028-3a75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  } ],
+  "variables" : [ "queue424460ef" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setInvalidMetadata.json b/storage/client/queue/src/test/resources/session-records/setInvalidMetadata.json
new file mode 100644
index 0000000000000..eb9faafed36f9
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setInvalidMetadata.json
@@ -0,0 +1,71 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue38693e14",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22272a-4003-0028-7175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:17:59 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue38693e14?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22274f-4003-0028-0b75-37b82d000000",
+      "Body" : "EmptyMetadataKeyThe key for one of the metadata key-value pairs is empty.\nRequestId:dd22274f-4003-0028-0b75-37b82d000000\nTime:2019-07-10T23:18:00.5359517Zbad metadata",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue38693e14/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222779-4003-0028-2875-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue38693e14",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222798-4003-0028-4375-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:00 GMT"
+    }
+  } ],
+  "variables" : [ "queue38693e14" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setMetadata.json b/storage/client/queue/src/test/resources/session-records/setMetadata.json
new file mode 100644
index 0000000000000..5d60ce89a352d
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setMetadata.json
@@ -0,0 +1,88 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue625780b6",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2263a4-4003-0028-7675-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue625780b6?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2263c0-4003-0028-0f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue625780b6?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2263d2-4003-0028-2075-37b82d000000",
+      "x-ms-meta-metadata2" : "value2",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue625780b6/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2263dd-4003-0028-2a75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue625780b6",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2263ea-4003-0028-3775-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:39 GMT"
+    }
+  } ],
+  "variables" : [ "queue625780b6" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json
new file mode 100644
index 0000000000000..4d7536d402ced
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json
@@ -0,0 +1,42 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue570099c0?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2260d2-4003-0028-2175-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd2260d2-4003-0028-2175-37b82d000000\nTime:2019-07-10T23:18:38.2057923Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue570099c0/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2260d9-4003-0028-2775-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd2260d9-4003-0028-2775-37b82d000000\nTime:2019-07-10T23:18:38.2538267Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue570099c0" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setProperties.json b/storage/client/queue/src/test/resources/session-records/setProperties.json
new file mode 100644
index 0000000000000..3c832f439b708
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setProperties.json
@@ -0,0 +1,114 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d2906b5-6003-009e-0476-37b6d5000000",
+      "Body" : "1.0falsefalsefalsefalse1.0truetruetrue71.0falsefalse",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d2906d0-6003-009e-1a76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290712-6003-009e-4e76-37b6d5000000",
+      "Body" : "1.0falsetruetruetrue31.0truefalsetrue31.0truefalsetrue3",
+      "Date" : "Wed, 10 Jul 2019 23:24:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290721-6003-009e-5b76-37b6d5000000",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d290739-6003-009e-7076-37b6d5000000",
+      "Body" : "1.0falsefalsefalsefalse1.0truetruetrue71.0falsefalse",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net?prefix=queue49487893&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "0d29074d-6003-009e-0176-37b6d5000000",
+      "Body" : "queue49487893",
+      "Date" : "Wed, 10 Jul 2019 23:24:48 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue49487893" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/setTooManyAccessPolicies.json b/storage/client/queue/src/test/resources/session-records/setTooManyAccessPolicies.json
new file mode 100644
index 0000000000000..adee338b14141
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/setTooManyAccessPolicies.json
@@ -0,0 +1,72 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue265747a2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22600f-4003-0028-7075-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue265747a2?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd226022-4003-0028-0175-37b82d000000",
+      "Body" : "InvalidXmlDocumentXML specified is not syntactically valid.\nRequestId:dd226022-4003-0028-0175-37b82d000000\nTime:2019-07-10T23:18:37.6694120Z00",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue265747a2/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226034-4003-0028-1175-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue265747a2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd226043-4003-0028-2075-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:37 GMT"
+    }
+  } ],
+  "variables" : [ "queue265747a2" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/updateMessage.json b/storage/client/queue/src/test/resources/session-records/updateMessage.json
new file mode 100644
index 0000000000000..46e184bda045c
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/updateMessage.json
@@ -0,0 +1,128 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue4236461c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd222c30-4003-0028-0f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue4236461c/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222c40-4003-0028-1c75-37b82d000000",
+      "Body" : "c3781181-9103-468e-b645-f6dbb100bd9cWed, 10 Jul 2019 23:18:02 GMTWed, 17 Jul 2019 23:18:02 GMTAgAAAAMAAAAAAAAAjQ/SuHU31QE=Wed, 10 Jul 2019 23:18:02 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue4236461c/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd222c62-4003-0028-3b75-37b82d000000",
+      "Body" : "c3781181-9103-468e-b645-f6dbb100bd9cWed, 10 Jul 2019 23:18:02 GMTWed, 17 Jul 2019 23:18:02 GMTAgAAAAMAAAAAAAAAEAO9ynU31QE=Wed, 10 Jul 2019 23:18:32 GMT1test message",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue4236461c/messages/c3781181-9103-468e-b645-f6dbb100bd9c?popreceipt=AgAAAAMAAAAAAAAAEAO9ynU31QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "Wed, 10 Jul 2019 23:18:04 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "dd222c7f-4003-0028-5475-37b82d000000",
+      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAAZuN9uXU31QEBAAAA",
+      "Date" : "Wed, 10 Jul 2019 23:18:02 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue4236461c/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2230d0-4003-0028-1b75-37b82d000000",
+      "Body" : "c3781181-9103-468e-b645-f6dbb100bd9cWed, 10 Jul 2019 23:18:02 GMTWed, 17 Jul 2019 23:18:02 GMT1updated test message",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue4236461c/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2230e9-4003-0028-2e75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue4236461c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223113-4003-0028-4f75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT"
+    }
+  } ],
+  "variables" : [ "queue4236461c" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/updateMessageInvalidMessageId.json b/storage/client/queue/src/test/resources/session-records/updateMessageInvalidMessageId.json
new file mode 100644
index 0000000000000..eae58afb9650c
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/updateMessageInvalidMessageId.json
@@ -0,0 +1,110 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue10019121",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223139-4003-0028-6d75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue10019121/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd223159-4003-0028-0475-37b82d000000",
+      "Body" : "e3dbec12-5e3c-47f4-abd9-fbdf6e44746dWed, 10 Jul 2019 23:18:05 GMTWed, 17 Jul 2019 23:18:05 GMTAgAAAAMAAAAAAAAA7UtBunU31QE=Wed, 10 Jul 2019 23:18:05 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue10019121/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd223169-4003-0028-1475-37b82d000000",
+      "Body" : "e3dbec12-5e3c-47f4-abd9-fbdf6e44746dWed, 10 Jul 2019 23:18:05 GMTWed, 17 Jul 2019 23:18:05 GMTAgAAAAMAAAAAAAAAc5EqzHU31QE=Wed, 10 Jul 2019 23:18:35 GMT1test message",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue10019121/messages/e3dbec12-5e3c-47f4-abd9-fbdf6e44746drandom?popreceipt=AgAAAAMAAAAAAAAAc5EqzHU31QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd22317f-4003-0028-2775-37b82d000000",
+      "Body" : "MessageNotFoundThe specified message does not exist.\nRequestId:dd22317f-4003-0028-2775-37b82d000000\nTime:2019-07-10T23:18:05.3974051Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue10019121/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223195-4003-0028-3975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:04 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue10019121",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2231a9-4003-0028-4975-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  } ],
+  "variables" : [ "queue10019121" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json b/storage/client/queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json
new file mode 100644
index 0000000000000..f7795c878f27f
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json
@@ -0,0 +1,110 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue41380e30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22326c-4003-0028-6c75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://sima.queue.core.windows.net/queue41380e30/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd22329c-4003-0028-1475-37b82d000000",
+      "Body" : "8900ad74-7404-4cd2-8b4b-41e70995dc1fWed, 10 Jul 2019 23:18:06 GMTWed, 17 Jul 2019 23:18:06 GMTAgAAAAMAAAAAAAAA/TyvunU31QE=Wed, 10 Jul 2019 23:18:06 GMT",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://sima.queue.core.windows.net/queue41380e30/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2232d5-4003-0028-4575-37b82d000000",
+      "Body" : "8900ad74-7404-4cd2-8b4b-41e70995dc1fWed, 10 Jul 2019 23:18:06 GMTWed, 17 Jul 2019 23:18:06 GMTAgAAAAMAAAAAAAAA+kWZzHU31QE=Wed, 10 Jul 2019 23:18:36 GMT1test message",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue41380e30/messages/8900ad74-7404-4cd2-8b4b-41e70995dc1f?popreceipt=AgAAAAMAAAAAAAAA%2bkWZzHU31QE%3drandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2232ff-4003-0028-6d75-37b82d000000",
+      "Body" : "InvalidQueryParameterValueValue for one of the query parameters specified in the request URI is invalid.\nRequestId:dd2232ff-4003-0028-6d75-37b82d000000\nTime:2019-07-10T23:18:06.1209188ZpopreceiptAgAAAAMAAAAAAAAA+kWZzHU31QE=randomInvalid pop receipt format",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue41380e30/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd22331d-4003-0028-0a75-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue41380e30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd223333-4003-0028-2075-37b82d000000",
+      "Date" : "Wed, 10 Jul 2019 23:18:05 GMT"
+    }
+  } ],
+  "variables" : [ "queue41380e30" ]
+}
\ No newline at end of file
diff --git a/storage/client/queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json b/storage/client/queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json
new file mode 100644
index 0000000000000..9341ea4a79897
--- /dev/null
+++ b/storage/client/queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json
@@ -0,0 +1,43 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://sima.queue.core.windows.net/queue77530b22/messages/doesn't?popreceipt=exist&visibilitytimeout=5",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 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" : "dd2229e1-4003-0028-1475-37b82d000000",
+      "Body" : "InvalidQueryParameterValueValue for one of the query parameters specified in the request URI is invalid.\nRequestId:dd2229e1-4003-0028-1475-37b82d000000\nTime:2019-07-10T23:18:01.7878412ZpopreceiptexistInvalid pop receipt format",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://sima.queue.core.windows.net/queue77530b22/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-storage-queue/1.0.0-SNAPSHOT 1.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" : "dd2229fb-4003-0028-2a75-37b82d000000",
+      "Body" : "QueueNotFoundThe specified queue does not exist.\nRequestId:dd2229fb-4003-0028-2a75-37b82d000000\nTime:2019-07-10T23:18:01.8368763Z",
+      "Date" : "Wed, 10 Jul 2019 23:18:01 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queue77530b22" ]
+}
\ No newline at end of file

From a5a8a87758403149bbe3350b0bdf5cabe75f9d6b Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Wed, 10 Jul 2019 16:34:45 -0700
Subject: [PATCH 02/16] Remove unnecssary changes

---
 .../src/main/resources/spotbugs/spotbugs-exclude.xml       | 6 ------
 pom.xml                                                    | 7 -------
 .../java/com/azure/storage/queue/QueueClientTests.java     | 2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

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 9f5f5eaf610ed..5f55e13d99146 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
@@ -406,12 +406,6 @@
     
   
 
-
-
-
-
-
-
   
   
     
diff --git a/pom.xml b/pom.xml
index e2fc0333ff915..125c326f84890 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,6 @@
   azure-sdk-all
   pom
   1.0.0
-  
-    
-      com.azure
-      azure-core
-      1.0.0-preview.2
-    
-  
 
   Microsoft Azure SDK for Java - All Modules
   Aggregated POM for Microsoft Azure SDK for Java
diff --git a/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
index fbfab6b397c51..a440c8f879f26 100644
--- a/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
@@ -245,7 +245,7 @@ public void getAccessPolicyQueueDoesNotExist() {
             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, 403);
+            helper.assertExceptionStatusCode(exception, 404);
         }
     }
 

From bc590b5ddcfb2449a5ed97ea609c95b4813a91c8 Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Thu, 11 Jul 2019 11:53:58 -0700
Subject: [PATCH 03/16] Address Alan's feedback.

---
 eng/jacoco-test-coverage/pom.xml              |  6 ++++
 .../policy/AnonymousCredentialPolicy.java     | 34 +++++++++++++++++++
 .../common/policy/RequestRetryOptions.java    |  6 ++--
 .../com/azure/storage/queue/QueueClient.java  |  3 +-
 .../storage/queue/QueueClientBuilder.java     | 25 ++++++++++----
 .../queue/QueueServiceClientBuilder.java      | 15 ++++++--
 .../com/azure/storage/queue/AsyncSamples.java | 11 ++----
 ...MessageSample.java => MessageSamples.java} | 10 ++----
 .../storage/queue/QueueExceptionSamples.java  |  7 +---
 ...ceSample.java => QueueServiceSamples.java} | 10 ++----
 .../com/azure/storage/queue/SampleHelper.java | 13 +++++++
 11 files changed, 99 insertions(+), 41 deletions(-)
 create mode 100644 storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java
 rename storage/client/queue/src/samples/java/com/azure/storage/queue/{MessageSample.java => MessageSamples.java} (91%)
 rename storage/client/queue/src/samples/java/com/azure/storage/queue/{QueueServiceSample.java => QueueServiceSamples.java} (82%)
 create mode 100644 storage/client/queue/src/samples/java/com/azure/storage/queue/SampleHelper.java

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index b6567bd45d9e5..6eff37a9f1f78 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -28,6 +28,7 @@
     1.0.0-preview.1
     4.0.0-preview.1
     5.0.0-preview.2
+    12.0.0-preview.1
   
 
   
@@ -84,6 +85,11 @@
       azure-messaging-eventhubs
       ${azure-messaging-eventhubs.version}
     
+    
+      com.azure
+      azure-storage-queue
+      ${azure-storage-queue.version}
+    
 
     
diff --git a/storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java b/storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java
new file mode 100644
index 0000000000000..f3513741d206d
--- /dev/null
+++ b/storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.common.policy;
+
+import com.azure.core.http.HttpPipelineCallContext;
+import com.azure.core.http.HttpPipelineNextPolicy;
+import com.azure.core.http.HttpResponse;
+import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.storage.queue.QueueClient;
+import com.azure.storage.queue.QueueServiceClient;
+import reactor.core.publisher.Mono;
+
+/**
+ * Anonymous credentials are to be used with with HTTP(S) requests that read blobs from public containers or requests
+ * that use a Shared Access Signature (SAS). This is because Anonymous credentials will not set an Authorization header.
+ * Pass an instance of this class as the credentials parameter when creating a new pipeline (typically with
+ * {@link QueueServiceClient}, {@link QueueClient}).
+ */
+public final class AnonymousCredentialPolicy implements HttpPipelinePolicy {
+
+    /**
+     * Returns an empty instance of {@code AnonymousCredentials}.
+     */
+    public AnonymousCredentialPolicy() {
+    }
+
+
+
+    @Override
+    public Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
+        return next.process();
+    }
+}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java b/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java
index fd84b71b8b092..6056505e6ddb4 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java
@@ -65,8 +65,10 @@ public RequestRetryOptions() {
      *
      * 
For more samples, please see the samples file

      * @throws IllegalArgumentException If one of the following case exists:
-     *                                      - There is only one null value for retryDelay and maxRetryDelay.
-     *                                      - Unrecognized retry policy type.
+     *                                  
    
+     *                                      
  •  There is only one null value for retryDelay and maxRetryDelay.
  • 
+     *                                      
  •  Unrecognized retry policy type.
  • 
+     *                                  

      */
     public RequestRetryOptions(RetryPolicyType retryPolicyType, Integer maxTries, Integer tryTimeout,
             Long retryDelayInMs, Long maxRetryDelayInMs, String secondaryHost) {
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
index 3183335a74735..f6f098839b8a5 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
@@ -53,7 +53,8 @@ public final class QueueClient {
     }
 
     /**
-     * @return the URL of the storage queue
+     * @return the URL of the storage queue.
+     * @throws RuntimeException If the queue is using a malformed URL.
      */
     public URL getQueueUrl() {
         return client.getQueueUrl();
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
index f4019a93e3fd1..92a8f7f36b164 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 package com.azure.storage.queue;
 
+import com.azure.core.credentials.TokenCredential;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.policy.AddDatePolicy;
@@ -86,6 +87,7 @@ public final class QueueClientBuilder {
     private String queueName;
     private SASTokenCredential sasTokenCredential;
     private SharedKeyCredential sharedKeyCredential;
+    private TokenCredential tokenCredential;
     private HttpClient httpClient;
     private HttpPipeline pipeline;
     private HttpLogDetailLevel logLevel;
@@ -142,14 +144,13 @@ public QueueAsyncClient buildAsyncClient() {
         Objects.requireNonNull(endpoint);
         Objects.requireNonNull(queueName);
 
-        if (pipeline != null) {
-            return new QueueAsyncClient(endpoint, pipeline, queueName);
-        }
-
         if (sasTokenCredential == null && sharedKeyCredential == null) {
             throw new IllegalArgumentException("Credentials are required for authorization");
         }
 
+        if (pipeline != null) {
+            return new QueueAsyncClient(endpoint, pipeline, queueName);
+        }
         // Closest to API goes first, closest to wire goes last.
         final List policies = new ArrayList<>();
 
@@ -229,7 +230,7 @@ public QueueClientBuilder queueName(String queueName) {
     }
 
     /**
-     * Sets the {@link SASTokenCredential} used to authenticate requests sent to the Queue service.
+     * Sets the {@link SASTokenCredential} used to authenticate requests sent to the Queue.
      *
      * @param credential SAS token credential generated from the Storage account that authorizes requests
      * @return the updated QueueClientBuilder object
@@ -240,6 +241,18 @@ public QueueClientBuilder credential(SASTokenCredential credential) {
         return this;
     }
 
+    /**
+     * Sets the {@link SharedKeyCredential} used to authenticate requests sent to the Queue.
+     *
+     * @param credential Shared key credential can retrieve from the Storage account that authorizes requests
+     * @return the updated QueueServiceClientBuilder object
+     * @throws NullPointerException If {@code credential} is {@code null}.
+     */
+    public QueueClientBuilder credential(SharedKeyCredential credential) {
+        this.sharedKeyCredential = credential;
+        return this;
+    }
+
     /**
      * Creates a {@link SharedKeyCredential} from the {@code connectionString} used to authenticate requests sent to the
      * Queue service.
@@ -249,8 +262,6 @@ public QueueClientBuilder credential(SASTokenCredential credential) {
      * @throws NullPointerException If {@code connectionString} is {@code null}.
      */
     public QueueClientBuilder connectionString(String connectionString) {
-        Objects.requireNonNull(connectionString);
-        this.sharedKeyCredential = SharedKeyCredential.fromConnectionString(connectionString);
         Objects.requireNonNull(connectionString);
         this.sharedKeyCredential = SharedKeyCredential.fromConnectionString(connectionString);
         getEndPointFromConnectionString(connectionString);
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
index 11da084cb1194..48d7b3d24b2c9 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
@@ -92,8 +92,6 @@ public QueueServiceClientBuilder() {
         logLevel = HttpLogDetailLevel.NONE;
         policies = new ArrayList<>();
         configuration = ConfigurationManager.getConfiguration();
-        retryPolicy = new RetryPolicy();
-        logLevel = HttpLogDetailLevel.NONE;
     }
 
     /**
@@ -208,6 +206,19 @@ public QueueServiceClientBuilder credential(SASTokenCredential credential) {
         return this;
     }
 
+    /**
+     * Sets the {@link SharedKeyCredential} used to authenticate requests sent to the Queue service.
+     *
+     * @param credential Shared key credential can retrieve from the Storage account that authorizes requests
+     * @return the updated QueueServiceClientBuilder object
+     * @throws NullPointerException If {@code credential} is {@code null}.
+     */
+    public QueueServiceClientBuilder credential(SharedKeyCredential credential) {
+        this.sharedKeyCredential = credential;
+        return this;
+    }
+
+
     /**
      * Creates a {@link SharedKeyCredential} from the {@code connectionString} used to authenticate requests sent to the
      * Queue service.
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java
index 01ab9ae55481a..39cc17db37ca2 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/AsyncSamples.java
@@ -3,7 +3,7 @@
 
 package com.azure.storage.queue;
 
-import java.util.UUID;
+import static com.azure.storage.queue.SampleHelper.generateRandomName;
 
 /*
  *  This example mimics some arbitrary number of clients continuously sending messages up to a queue in a parallel and
@@ -25,8 +25,8 @@ public static void main(String[] args) {
 
         // Create a queue, enqueue two messages.
         queueAsyncClient.create()
-            .flatMap(response -> queueAsyncClient.enqueueMessage("This is message 1"))
-            .flatMap(response -> queueAsyncClient.enqueueMessage("This is message 2"))
+            .doOnSuccess(response -> queueAsyncClient.enqueueMessage("This is message 1"))
+            .then(queueAsyncClient.enqueueMessage("This is message 2"))
             .subscribe(
                 response -> {
                     System.out.println("Message successfully equeueed by queueAsyncClient. Message id:" + response.value().messageId());
@@ -39,9 +39,4 @@ public static void main(String[] args) {
                 }
             );
     }
-
-    private static String generateRandomName(String prefix, int length) {
-        int len = length > prefix.length() ? length - prefix.length() : 0;
-        return prefix + UUID.randomUUID().toString().substring(0, len);
-    }
 }
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSample.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSamples.java
similarity index 91%
rename from storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSample.java
rename to storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSamples.java
index 124c5023a1bcb..1372d45b9e808 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSample.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/MessageSamples.java
@@ -7,9 +7,10 @@
 import com.azure.storage.queue.models.DequeuedMessage;
 
 import java.time.Duration;
-import java.util.UUID;
 
-public class MessageSample {
+import static com.azure.storage.queue.SampleHelper.generateRandomName;
+
+public class MessageSamples {
     private static final String ACCOUNT_NAME = System.getenv("AZURE_STORAGE_ACCOUNT_NAME");
     private static final String SAS_TOKEN = System.getenv("PRIMARY_SAS_TOKEN");
 
@@ -69,9 +70,4 @@ public static void main(String[] args) throws InterruptedException {
         // Finally, we delete the queue.
         queueClient.delete();
     }
-
-    private static String generateRandomName(String prefix, int length) {
-        int len = length > prefix.length() ? length - prefix.length() : 0;
-        return prefix + UUID.randomUUID().toString().substring(0, len);
-    }
 }
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java
index aaddf3ed337eb..d0ee4c8f2aed4 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueExceptionSamples.java
@@ -7,7 +7,7 @@
 import com.azure.storage.queue.models.StorageErrorCode;
 import com.azure.storage.queue.models.StorageErrorException;
 
-import java.util.UUID;
+import static com.azure.storage.queue.SampleHelper.generateRandomName;
 
 public class QueueExceptionSamples {
     private static final String ACCOUNT_NAME = System.getenv("AZURE_STORAGE_ACCOUNT_NAME");
@@ -66,9 +66,4 @@ public static void main(String[] args) {
             }
         }
     }
-
-    private static String generateRandomName(String prefix, int length) {
-        int len = length > prefix.length() ? length - prefix.length() : 0;
-        return prefix + UUID.randomUUID().toString().substring(0, len);
-    }
 }
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSample.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSamples.java
similarity index 82%
rename from storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSample.java
rename to storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSamples.java
index d52b845ae97e7..ed1a9875a3d03 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSample.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/QueueServiceSamples.java
@@ -3,9 +3,9 @@
 
 package com.azure.storage.queue;
 
-import java.util.UUID;
+import static com.azure.storage.queue.SampleHelper.generateRandomName;
 
-public class QueueServiceSample {
+public class QueueServiceSamples {
     private static final String ACCOUNT_NAME = System.getenv("AZURE_STORAGE_ACCOUNT_NAME");
     private static final String SAS_TOKEN = System.getenv("PRIMARY_SAS_TOKEN");
 
@@ -28,10 +28,4 @@ public static void main(String[] args) {
             }
         );
     }
-
-    private static String generateRandomName(String prefix, int length) {
-        int len = length > prefix.length() ? length - prefix.length() : 0;
-        return prefix + UUID.randomUUID().toString().substring(0, len);
-    }
-
 }
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/SampleHelper.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/SampleHelper.java
new file mode 100644
index 0000000000000..094a52026ffe6
--- /dev/null
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/SampleHelper.java
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue;
+
+import java.util.UUID;
+
+class SampleHelper {
+    static String generateRandomName(String prefix, int length) {
+        int len = length > prefix.length() ? length - prefix.length() : 0;
+        return prefix + UUID.randomUUID().toString().substring(0, len);
+    }
+}

From 52a8de0710343c2ad63ac3909f4dfd3866a03468 Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Thu, 11 Jul 2019 12:12:38 -0700
Subject: [PATCH 04/16] Remove unused fields

---
 .../com/azure/storage/common/policy/RequestRetryOptions.java   | 3 +--
 .../main/java/com/azure/storage/queue/QueueClientBuilder.java  | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java b/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java
index 6056505e6ddb4..23bdec3f5d48f 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/common/policy/RequestRetryOptions.java
@@ -65,7 +65,7 @@ public RequestRetryOptions() {
      *
      * 
For more samples, please see the samples file

      * @throws IllegalArgumentException If one of the following case exists:
-     *                                  
    
+     *                                  
      
      *                                      
    •  There is only one null value for retryDelay and maxRetryDelay.
    • 
      *                                      
    •  Unrecognized retry policy type.
    • 
      *                                  
    
@@ -110,7 +110,6 @@ public RequestRetryOptions(RetryPolicyType retryPolicyType, Integer maxTries, In
             }
             this.maxRetryDelayInMs = TimeUnit.SECONDS.toMillis(120);
         }
-
         this.secondaryHost = secondaryHost;
     }
 
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
index 92a8f7f36b164..2d84eb5f1b4d0 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -87,7 +87,6 @@ public final class QueueClientBuilder {
     private String queueName;
     private SASTokenCredential sasTokenCredential;
     private SharedKeyCredential sharedKeyCredential;
-    private TokenCredential tokenCredential;
     private HttpClient httpClient;
     private HttpPipeline pipeline;
     private HttpLogDetailLevel logLevel;

From 4205b7ebb8249035a0080b3b5cabcdb724372358 Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Thu, 11 Jul 2019 12:13:16 -0700
Subject: [PATCH 05/16] Remove unused imports

---
 .../main/java/com/azure/storage/queue/QueueClientBuilder.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
index 2d84eb5f1b4d0..561869ea5a717 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 package com.azure.storage.queue;
 
-import com.azure.core.credentials.TokenCredential;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.policy.AddDatePolicy;

From 4091695611c814de4f1c35d1a8f67bfd216fc645 Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Fri, 12 Jul 2019 17:20:47 -0700
Subject: [PATCH 06/16] Fixed the missing tag

---
 eng/spotbugs-aggregate-report/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
index add201e829dc8..e201d26558be2 100644
--- a/eng/spotbugs-aggregate-report/pom.xml
+++ b/eng/spotbugs-aggregate-report/pom.xml
@@ -168,6 +168,7 @@
           azure-storage-queue
           ${azure-storage-queue.version}
         
+        
           azure-identity
           ${azure-identity.version}
         

From 433dfbe1768d4177bfa408f0f8d6fa452c4066f8 Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Fri, 12 Jul 2019 17:31:50 -0700
Subject: [PATCH 07/16] Fixed the missing group id

---
 eng/spotbugs-aggregate-report/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
index e201d26558be2..f9463e3e7d285 100644
--- a/eng/spotbugs-aggregate-report/pom.xml
+++ b/eng/spotbugs-aggregate-report/pom.xml
@@ -169,6 +169,7 @@
           ${azure-storage-queue.version}
         
         
+          com.azure
           azure-identity
           ${azure-identity.version}
         

From 45e5fa4db1f2dbac36e4e9c8886bd47dfdc4b29b Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Mon, 15 Jul 2019 15:26:37 -0700
Subject: [PATCH 08/16] Added the queue service javadoc code snippet.

---
 .../queue/QueueServiceAsyncClient.java        |  50 +-----
 .../storage/queue/QueueServiceClient.java     |  46 +----
 .../QueueServiceJavaDocCodeSamples.java       | 170 +++++++++++++++++-
 3 files changed, 181 insertions(+), 85 deletions(-)

diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
index e4b13b10cef54..6bff4084c9fe0 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
@@ -116,10 +116,7 @@ public Mono> createQueue(String queueName) {
      *
      * 
    Create the queue "test" with metadata "queue:metadata"
    
      *
-     * 
    -     * client.createQueue("test", Collections.singletonMap("queue", "metadata"))
-     *     .subscribe(response -> System.out.printf("Creating the queue completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.createQueue#string-map}
      *
      * @param queueName Name of the queue
      * @param metadata Metadata to associate with the queue
@@ -173,19 +170,9 @@ public Flux listQueues() {
      *
      * 
    Code Samples
    
      *
-     * 
    List all queues and their metadata in the account
    
-     *
-     * 
    -     * client.listQueues(new QueuesSegmentOptions().includeMetadata(true))
-     *     .subscribe(result -> System.out.printf("Queue %s exists in the account and has metadata %s", result.name(), result.metadata()));
-     * 
    
-     *
      * 
    List all queues that begin with "azure"
    
      *
-     * 
    -     * client.listQueues(new QueuesSegmentOptions().prefix("azure"))
-     *     .subscribe(result -> System.out.printf("Queue %s exists in the account", result.name()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.listQueues#queueSergmentOptions}
      *
      * @param options Options for listing queues
      * @return {@link QueueItem Queues} in the storage account that satisfy the filter requirements
@@ -254,13 +241,7 @@ private Publisher extractAndFetchQueues(ServicesListQueuesSegmentResp
      *
      * 
    Retrieve Queue service properties
    
      *
-     * 
    -     * client.getProperties()
-     *     .subscribe(response -> {
-     *         StorageServiceProperties properties = response.value();
-     *         System.out.printf("Hour metrics enabled: %b, Minute metrics enabled: %b", properties.hourMetrics().enabled(), properties.minuteMetrics().enabled());
-     *     });
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.getProperties}
      *
      * @return Storage account Queue service properties
      */
@@ -280,24 +261,11 @@ public Mono> getProperties() {
      *
      * 
    Clear CORS in the Queue service
    
      *
-     * 
    -     * StorageServiceProperties properties = client.getProperties().block().value();
-     * properties.cors(Collections.emptyList());
-     *
-     * client.setProperties(properties)
-     *     .subscribe(response -> System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.setProperties#storageServiceProperties}
      *
      * 
    Enable Minute and Hour Metrics
    
      *
-     * 
    -     * StorageServiceProperties properties = client.getProperties().block().value();
-     * properties.minuteMetrics().enabled(true);
-     * properties.hourMetrics().enabled(true);
-     *
-     * client.setProperties(properties)
-     *     .subscribe(response -> System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.setPropertiesEnableMetrics#storageServiceProperties}
      *
      * @param properties Storage account Queue service properties
      * @return A response that only contains headers and response status code
@@ -325,13 +293,7 @@ public Mono setProperties(StorageServiceProperties properties) {
      *
      * 
    Retrieve the geo replication information
    
      *
-     * 
    -     * client.getStatistics()
-     *     .subscribe(response -> {
-     *         StorageServiceStats stats = response.value();
-     *         System.out.printf("Geo replication status: %s, Last synced: %s", stats.geoReplication.status(), stats.geoReplication().lastSyncTime());
-     *     });
-     * 
    
+     * {@codesnipeet com.azure.storage.queue.queueServiceAsyncClient.getStatistics}
      *
      * @return The geo replication information about the Queue service
      */
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
index 0bebaaf2039cf..98c5a4b06b075 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
@@ -93,10 +93,7 @@ public Response createQueue(String queueName) {
      *
      * 
    Create the queue "test" with metadata "queue:metadata"
    
      *
-     * 
    -     * Response<QueueClient> = client.createQueue("test", Collections.singletonMap("queue", "metadata"));
-     * System.out.printf("Creating the queue completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.createQueue#string-map}
      *
      * @param queueName Name of the queue
      * @param metadata Metadata to associate with the queue
@@ -149,21 +146,9 @@ public Iterable listQueues() {
      *
      * 
    Code Samples
    
      *
-     * 
    List all queues and their metadata in the account
    
-     *
-     * 
    -     * for (QueueItem queue : client.listQueues(new QueuesSegmentOptions().includeMetadata(true))) {
-     *     System.out.printf("Queue %s exists in the account and has metadata %s", queue.name(), queue.metadata());
-     * }
-     * 
    
-     *
      * 
    List all queues that begin with "azure"
    
      *
-     * 
    -     * for (QueueItem queue : client.listQueues(new QueuesSegmentOptions().prefix("azure"))) {
-     *     System.out.printf("Queue %s exists in the account", queue.name());
-     * }
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.listQueues#queueSergmentOptions}
      *
      * @param options Options for listing queues
      * @return {@link QueueItem Queues} in the storage account that satisfy the filter requirements
@@ -194,10 +179,7 @@ Iterable listQueues(String marker, QueuesSegmentOptions options) {
      *
      * 
    Retrieve Queue service properties
    
      *
-     * 
    -     * StorageServiceProperties properties = client.getProperties().value();
-     * System.out.printf("Hour metrics enabled: %b, Minute metrics enabled: %b", properties.hourMetrics().enabled(), properties.minuteMetrics().enabled());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.getProperties}
      *
      * @return Storage account Queue service properties
      */
@@ -216,24 +198,11 @@ public Response getProperties() {
      *
      * 
    Clear CORS in the Queue service
    
      *
-     * 
    -     * StorageServiceProperties properties = client.getProperties().value();
-     * properties.cors(Collections.emptyList());
-     *
-     * VoidResponse response = client.setProperties(properties);
-     * System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.setProperties#storageServiceProperties}
      *
      * 
    Enable Minute and Hour Metrics
    
      *
-     * 
    -     * StorageServiceProperties properties = client.getProperties().value();
-     * properties.minuteMetrics().enabled(true);
-     * properties.hourMetrics().enabled(true);
-     *
-     * VoidResponse response = client.setProperties(properties);
-     * System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.setPropertiesEnableMetrics#storageServiceProperties}
      *
      * @param properties Storage account Queue service properties
      * @return A response that only contains headers and response status code
@@ -260,10 +229,7 @@ public VoidResponse setProperties(StorageServiceProperties properties) {
      *
      * 
    Retrieve the geo replication information
    
      *
-     * 
    -     * StorageServiceStats stats = client.getStatistics().value();
-     * System.out.printf("Geo replication status: %s, Last synced: %s", stats.geoReplication.status(), stats.geoReplication().lastSyncTime());
-     * 
    
+     * {@codesnipeet com.azure.storage.queue.queueServiceClient.getStatistics}
      *
      * @return The geo replication information about the Queue service
      */
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
index 389fa6fe28b2a..41150b593ffc4 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
@@ -10,6 +10,11 @@
 import com.azure.storage.queue.QueueServiceAsyncClient;
 import com.azure.storage.queue.QueueServiceClient;
 import com.azure.storage.queue.QueueServiceClientBuilder;
+import com.azure.storage.queue.models.QueuesSegmentOptions;
+import com.azure.storage.queue.models.StorageServiceProperties;
+import com.azure.storage.queue.models.StorageServiceStats;
+import java.util.Collections;
+import java.util.Map;
 
 /**
  * Contains code snippets when generating javadocs through doclets for {@link QueueServiceClient} and {@link QueueServiceAsyncClient}.
@@ -96,6 +101,32 @@ public void createQueueAsync() {
         // END: com.azure.storage.queue.queueServiceAsyncClient.createQueue#string
     }
 
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#createQueue(String, Map)}
+     */
+    public void createQueueMaxOverload() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.createQueue#string-map
+        Response response = queueServiceClient.createQueue("myqueue",
+            Collections.singletonMap("queue", "metadata"));
+        System.out.println("Complete creating queue with status code: " + response.statusCode());
+        // END: com.azure.storage.queue.queueServiceClient.createQueue#string-map
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#createQueue(String, Map)}
+     */
+    public void createQueueAsyncMaxOverload() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.createQueue#string-map
+        queueServiceAsyncClient.createQueue("myqueue", Collections.singletonMap("queue", "metadata"))
+            .subscribe(
+            response -> System.out.printf("Creating the queue with status code %d", response.statusCode()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete creating the queue!")
+        );
+        // END: com.azure.storage.queue.queueServiceAsyncClient.createQueue#string-map
+    }
 
     /**
      * Generates a code sample for using {@link QueueServiceClient#listQueues()}
@@ -123,6 +154,34 @@ public void listQueuesAsync() {
         // END: com.azure.storage.queue.queueServiceAsyncClient.listQueues
     }
 
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#listQueues(QueuesSegmentOptions)} )}
+     */
+    public void listQueuesWithOverload() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.listQueues#queueSergmentOptions
+        queueServiceClient.listQueues(new QueuesSegmentOptions().prefix("azure")).forEach(
+            queueItem -> System.out.printf("Queue %s exists in the account and has metadata %s",
+                queueItem.name(), queueItem.metadata())
+        );
+        // END: com.azure.storage.queue.queueServiceClient.listQueues#queueSergmentOptions
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#listQueues(QueuesSegmentOptions)}
+     */
+    public void listQueuesAsyncWithOverload() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.listQueues#queueSergmentOptions
+        queueServiceAsyncClient.listQueues(new QueuesSegmentOptions().prefix("azure")).subscribe(
+            queueItem -> System.out.printf("Queue %s exists in the account and has metadata %s",
+                queueItem.name(), queueItem.metadata()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete listing the queues!")
+        );
+        // END: com.azure.storage.queue.queueServiceAsyncClient.listQueues#queueSergmentOptions
+    }
+
     /**
      * Generates a code sample for using {@link QueueServiceClient#deleteQueue(String)}
      */
@@ -134,7 +193,6 @@ public void deleteQueue() {
         // END: com.azure.storage.queue.queueServiceClient.deleteQueue#string
     }
 
-
     /**
      * Generates a code sample for using {@link QueueServiceAsyncClient#deleteQueue(String)}
      */
@@ -146,4 +204,114 @@ public void deleteQueueAsync() {
         );
         // END: com.azure.storage.queue.queueServiceAsyncClient.deleteQueue#string
     }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#getProperties()}
+     */
+    public void getProperties() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.getProperties
+        StorageServiceProperties properties = queueServiceClient.getProperties().value();
+        System.out.printf("Hour metrics enabled: %b, Minute metrics enabled: %b",
+            properties.hourMetrics().enabled(), properties.minuteMetrics().enabled());
+        // END: com.azure.storage.queue.queueServiceClient.getProperties
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#getProperties()}
+     */
+    public void getPropertiesAsync() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.getProperties
+        queueServiceAsyncClient.getProperties()
+            .subscribe(response -> {
+                StorageServiceProperties properties = response.value();
+                System.out.printf("Hour metrics enabled: %b, Minute metrics enabled: %b",
+                    properties.hourMetrics().enabled(), properties.minuteMetrics().enabled());
+            });
+        // END: com.azure.storage.queue.queueServiceAsyncClient.getProperties
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#setProperties(StorageServiceProperties)}
+     */
+    public void setProperties() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.setProperties#storageServiceProperties
+        StorageServiceProperties properties = queueServiceClient.getProperties().value();
+        properties.cors(Collections.emptyList());
+
+        VoidResponse response = queueServiceClient.setProperties(properties);
+        System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode());
+        // END: com.azure.storage.queue.queueServiceClient.setProperties#storageServiceProperties
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#setProperties(StorageServiceProperties)}
+     */
+    public void setPropertiesAsync() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.setProperties#storageServiceProperties
+        StorageServiceProperties properties = queueServiceAsyncClient.getProperties().block().value();
+        queueServiceAsyncClient.setProperties(properties)
+            .subscribe(response -> System.out.printf("Setting Queue service properties completed with status code %d",
+                response.statusCode()));
+        // END: com.azure.storage.queue.queueServiceAsyncClient.setProperties#storageServiceProperties
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#setProperties(StorageServiceProperties)} with metrics enabled.
+     */
+    public void setPropertiesEnableMetrics() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.setPropertiesEnableMetrics#storageServiceProperties
+        StorageServiceProperties properties = queueServiceClient.getProperties().value();
+        properties.minuteMetrics().enabled(true);
+        properties.hourMetrics().enabled(true);
+        VoidResponse response = queueServiceClient.setProperties(properties);
+        System.out.printf("Setting Queue service properties completed with status code %d", response.statusCode());
+        // END: com.azure.storage.queue.queueServiceClient.setPropertiesEnableMetrics#storageServiceProperties
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#setProperties(StorageServiceProperties)} with metrics enabled.
+     */
+    public void setPropertiesAsyncEnableMetrics() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.setPropertiesEnableMetrics#storageServiceProperties
+        StorageServiceProperties properties = queueServiceAsyncClient.getProperties().block().value();
+        properties.minuteMetrics().enabled(true);
+        properties.hourMetrics().enabled(true);
+        queueServiceAsyncClient.setProperties(properties)
+            .subscribe(response -> System.out.printf("Setting Queue service properties completed with status code %d",
+                response.statusCode()));
+        // END: com.azure.storage.queue.queueServiceAsyncClient.setPropertiesEnableMetrics#storageServiceProperties
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceClient#getStatistics()}
+     */
+    public void getStatistics() {
+        QueueServiceClient queueServiceClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceClient.getStatistics
+        StorageServiceStats stats = queueServiceClient.getStatistics().value();
+        System.out.printf("Geo replication status: %s, Last synced: %s",
+            stats.geoReplication().status(), stats.geoReplication().lastSyncTime());
+        // END: com.azure.storage.queue.queueServiceClient.getStatistics
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueServiceAsyncClient#getStatistics()}
+     */
+    public void getStatisticsAsync() {
+        QueueServiceAsyncClient queueServiceAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.getStatistics
+        queueServiceAsyncClient.getStatistics()
+            .subscribe(response -> {
+                StorageServiceStats stats = response.value();
+                System.out.printf("Geo replication status: %s, Last synced: %s",
+                    stats.geoReplication().status(), stats.geoReplication().lastSyncTime());
+            });
+        // END: com.azure.storage.queue.queueServiceAsyncClient.getStatistics
+    }
 }

From 1338dc7cba964f99326cfbbb5c60254efa431a0b Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Mon, 15 Jul 2019 15:40:43 -0700
Subject: [PATCH 09/16] Added the queue service builder javadoc code snippet.

---
 .../queue/QueueServiceClientBuilder.java      | 15 +++------
 .../QueueServiceJavaDocCodeSamples.java       | 31 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
index 48d7b3d24b2c9..f570fc3a3aaf9 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
@@ -40,17 +40,12 @@
  * 
    Instantiating an Asynchronous Queue Service Client with SAS token
    
  * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation.sastoken}
  *
- * 
    - * QueueServiceClient client = QueueServiceClient.builder()
- *     .endpoint(endpointWithSASTokenQueryParams)
- *     .buildClient();
- * 
    
+ * 
    If the {@code endpoint} doesn't contain {@code SASTokenCredential} they may be set using
+ * {@link QueueClientBuilder#credential(SASTokenCredential) credential}.
    
  *
- * 
    - * QueueServiceAsyncClient client = QueueServiceAsyncClient.builder()
- *     .endpoint(endpointWithSASTokenQueryParams)
- *     .buildAsyncClient();
- * 
    
+ * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation.credential}
+ *
+ * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation.credential}
  *
  * 
    If the {@code endpoint} doesn't contain the query parameters to construct a {@code SASTokenCredential} they may
  * be set using {@link QueueServiceClientBuilder#credential(SASTokenCredential) credential}.
    
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
index 41150b593ffc4..d6049412316c0 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
@@ -20,8 +20,9 @@
  * Contains code snippets when generating javadocs through doclets for {@link QueueServiceClient} and {@link QueueServiceAsyncClient}.
  */
 public class QueueServiceJavaDocCodeSamples {
+
     /**
-     * Generates code sample for creating a {@link QueueServiceClient} with {@link QueueServiceClient}
+     * Generates code sample for creating a {@link QueueServiceClient} with {@link SASTokenCredential}
      * @return An instance of {@link QueueServiceClient}
      */
     public QueueServiceClient createClientWithSASToken() {
@@ -46,6 +47,34 @@ public QueueServiceAsyncClient createAsyncClientWithSASToken() {
         return queueServiceAsyncClient;
     }
 
+    /**
+     * Generates code sample for creating a {@link QueueServiceClient} with {@link SASTokenCredential}
+     * @return An instance of {@link QueueServiceClient}
+     */
+    public QueueServiceClient createClientWithCredential() {
+        // BEGIN: com.azure.storage.queue.queueServiceClient.instantiation.credential
+        QueueServiceClient queueServiceClient = new QueueServiceClientBuilder()
+            .endpoint("https://${accountName}.queue.core.windows.net")
+            .credential(SASTokenCredential.fromQuery("{SASTokenQueryParams}"))
+            .buildClient();
+        // END: com.azure.storage.queue.queueServiceClient.instantiation.credential
+        return queueServiceClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueServiceAsyncClient} with {@link SASTokenCredential}
+     * @return An instance of {@link QueueServiceAsyncClient}
+     */
+    public QueueServiceAsyncClient createAsyncClientWithCredential() {
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.instantiation.credential
+        QueueServiceAsyncClient queueServiceAsyncClient = new QueueServiceClientBuilder()
+            .endpoint("https://{accountName}.queue.core.windows.net")
+            .credential(SASTokenCredential.fromQuery("{SASTokenQueryParams}"))
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueServiceAsyncClient.instantiation.credential
+        return queueServiceAsyncClient;
+    }
+
     /**
      * Generates code sample for creating a {@link QueueServiceClient} with {@code connectionString} which turns into {@link SharedKeyCredential}
      * @return An instance of {@link QueueServiceClient}

From 844c0ff5ac9dde90a90f1e2813b6c7e99ffde61c Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Mon, 15 Jul 2019 15:46:48 -0700
Subject: [PATCH 10/16] Added the queue builder javadoc code snippet.

---
 .../storage/queue/QueueClientBuilder.java     | 22 ++++---------
 .../queue/QueueServiceClientBuilder.java      |  2 ++
 .../javadoc/QueueJavaDocCodeSamples.java      | 33 +++++++++++++++++++
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
index 561869ea5a717..d91e49c1156f1 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -37,30 +37,20 @@
  * {@link QueueClientBuilder#endpoint(String) endpoint} gives the builder the endpoint and may give the builder the
  * {@link QueueClientBuilder#queueName(String) queueName} and a {@link SASTokenCredential} that authorizes the client.
    
  *
- * 
    Instantiating a synchronous Queue Service Client with SAS token
    
+ * 
    Instantiating a synchronous Queue Client with SAS token
    
  * {@codesnippet com.azure.storage.queue.queueClient.instantiation.sastoken}
  *
- * 
    Instantiating an Asynchronous Queue Service Client with SAS token
    
+ * 
    Instantiating an Asynchronous Queue Client with SAS token
    
  * {@codesnippet com.azure.storage.queue.queueAsyncClient.instantiation.sastoken}
  *
  * 
    If the {@code endpoint} doesn't contain the queue name or {@code SASTokenCredential} they may be set using
  * {@link QueueClientBuilder#queueName(String) queueName} and {@link QueueClientBuilder#credential(SASTokenCredential) credential}.
    
  *
- * 
    - * QueueClient client = QueueClient.builder()
- *     .endpoint(endpointWithoutQueueNameOrSASTokenQueryParams)
- *     .queueName(queueName)
- *     .credential(SASTokenCredential.fromQuery(SASTokenQueryParams))
- *     .buildClient();
- * 
    
+ * 
    Instantiating a synchronous Queue Client with credential
    
+ * {@codesnippet com.azure.storage.queue.queueClient.instantiation.credential}
  *
- * 
    - * QueueAsyncClient client = QueueAsyncClient.builder()
- *     .endpoint(endpointWithoutQueueNameOrSASTokenQueryParams)
- *     .queueName(queueName)
- *     .credential(SASTokenCredential.fromQuery(SASTokenQueryParams))
- *     .buildAsyncClient();
- * 
    
+ * 
    Instantiating an Asynchronous Queue Client with credential
    
+ * {@codesnippet com.azure.storage.queue.queueAsyncClient.instantiation.credential}
  *
  * 
    Another way to authenticate the client is using a {@link SharedKeyCredential}. To create a SharedKeyCredential
  * a connection string from the Storage Queue service must be used. Set the SharedKeyCredential with
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
index f570fc3a3aaf9..680501f09f51b 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
@@ -43,8 +43,10 @@
  * 
    If the {@code endpoint} doesn't contain {@code SASTokenCredential} they may be set using
  * {@link QueueClientBuilder#credential(SASTokenCredential) credential}.
    
  *
+ * 
    Instantiating a synchronous Queue Service Client with SAS token
    
  * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation.credential}
  *
+ * 
    Instantiating an Asynchronous Queue Service Client with SAS token
    
  * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation.credential}
  *
  * 
    If the {@code endpoint} doesn't contain the query parameters to construct a {@code SASTokenCredential} they may
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
index e89f1d98a3bac..a115419ee67fa 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
@@ -9,6 +9,9 @@
 import com.azure.storage.queue.QueueAsyncClient;
 import com.azure.storage.queue.QueueClient;
 import com.azure.storage.queue.QueueClientBuilder;
+import com.azure.storage.queue.QueueServiceAsyncClient;
+import com.azure.storage.queue.QueueServiceClient;
+import com.azure.storage.queue.QueueServiceClientBuilder;
 import com.azure.storage.queue.models.EnqueuedMessage;
 import com.azure.storage.queue.models.UpdatedMessage;
 import java.time.Duration;
@@ -44,6 +47,36 @@ public QueueAsyncClient createAsyncClientWithSASToken() {
         return queueAsyncClient;
     }
 
+    /**
+     * Generates code sample for creating a {@link QueueClient} with {@link SASTokenCredential}
+     * @return An instance of {@link QueueClient}
+     */
+    public QueueClient createClientWithCredential() {
+        // BEGIN: com.azure.storage.queue.queueClient.instantiation.credential
+        QueueClient queueClient = new QueueClientBuilder()
+            .endpoint("https://${accountName}.queue.core.windows.net")
+            .queueName("myqueue")
+            .credential(SASTokenCredential.fromQuery("{SASTokenQueryParams}"))
+            .buildClient();
+        // END: com.azure.storage.queue.queueClient.instantiation.credential
+        return queueClient;
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueAsyncClient} with {@link SASTokenCredential}
+     * @return An instance of {@link QueueAsyncClient}
+     */
+    public QueueAsyncClient createAsyncClientWithCredential() {
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.instantiation.credential
+        QueueAsyncClient queueAsyncClient = new QueueClientBuilder()
+            .endpoint("https://{accountName}.queue.core.windows.net")
+            .queueName("myqueue")
+            .credential(SASTokenCredential.fromQuery("{SASTokenQueryParams}"))
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueAsyncClient.instantiation.credential
+        return queueAsyncClient;
+    }
+
     /**
      * Generates code sample for creating a {@link QueueClient} with {@code connectionString} which turns into {@link SharedKeyCredential}
      * @return An instance of {@link QueueClient}

From 136972146882866ff1b0729e506eaa7b1b5190dc Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Mon, 15 Jul 2019 17:44:08 -0700
Subject: [PATCH 11/16] Queue client java doc code snippet

---
 storage/client/queue/README.md                |   1 -
 .../azure/storage/queue/QueueAsyncClient.java |  70 +---
 .../com/azure/storage/queue/QueueClient.java  |  69 +---
 .../javadoc/QueueJavaDocCodeSamples.java      | 332 +++++++++++++++++-
 4 files changed, 354 insertions(+), 118 deletions(-)

diff --git a/storage/client/queue/README.md b/storage/client/queue/README.md
index 7b4dbbf1afadd..dd4f4ef16ad56 100644
--- a/storage/client/queue/README.md
+++ b/storage/client/queue/README.md
@@ -52,7 +52,6 @@ az storage queue generate-sas
 
 ```Powershell
 CONNECTION_STRING=
-#usage example
 az storage queue generate-sas
     --name javasdksas
     --expiry 2019-06-05
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
index 4ebb74cbdfa2f..09662cf1c0d6b 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -124,10 +124,7 @@ public Mono create() {
      *
      * 
    Create a queue with metadata "queue:metadataMap"
    
      *
-     * 
    -     * client.create(Collections.singletonMap("queue", "metadataMap"))
-     *     .subscribe(response -> System.out.printf("Create completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.create#map}
      *
      * @param metadata Metadata to associate with the queue
      * @return A response that only contains headers and response status code
@@ -162,13 +159,7 @@ public Mono delete() {
      *
      * 
    Get the properties of the queue
    
      *
-     * 
    -     * client.getProperties()
-     *     .subscribe(response -> {
-     *         QueueProperties properties = response.value();
-     *         System.out.printf("Metadata: %s, Approximate message count: %d", properties.metadata(), properties.approximateMessagesCount());
-     *     });
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.getProperties}
      *
      * @return A response containing a {@link QueueProperties} value which contains the metadata and approximate
      * messages count of the queue.
@@ -188,17 +179,11 @@ public Mono> getProperties() {
      *
      * 
    Set the queue's metadata to "queue:metadataMap"
    
      *
-     * 
    -     * client.setMetadata(Collections.singletonMap("queue", "metadataMap"))
-     *     .subscribe(response -> System.out.printf("Setting metadata completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.setMetadata#map}
      *
      * 
    Clear the queue's metadata
    
      *
-     * 
    -     * client.setMetadata(null)
-     *     .subscribe(response -> System.out.printf("Clearing metadata completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.clearMetadata#map}
      *
      * @param metadata Metadata to set on the queue
      * @return A response that only contains headers and response status code
@@ -216,10 +201,7 @@ public Mono setMetadata(Map metadata) {
      *
      * 
    List the stored access policies
    
      *
-     * 
    -     * client.getAccessPolicy()
-     *     .subscribe(result -> System.out.printf("Access policy %s allows these permissions: %s", result.id(), result.accessPolicy().permission()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.getAccessPolicy
      *
      * @return The stored access policies specified on the queue.
      * @throws StorageErrorException If the queue doesn't exist
@@ -236,16 +218,7 @@ public Flux getAccessPolicy() {
      *
      * 
    Set a read only stored access policy
    
      *
-     * 
    -     * AccessPolicy policy = new AccessPolicy().permission("r")
-     *     .start(OffsetDateTime.now(ZoneOffset.UTC))
-     *     .expiry(OffsetDateTime.now(ZoneOffset.UTC).addDays(10));
-     *
-     * SignedIdentifier permission = new SignedIdentifier().id("mypolicy").accessPolicy(accessPolicy);
-     *
-     * client.setAccessPolicy(Collections.singletonList(permission))
-     *     .subscribe(response -> System.out.printf("Setting access policies completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.setAccessPolicy}
      *
      * @param permissions Access policies to set on the queue
      * @return A response that only contains headers and response status code
@@ -264,10 +237,7 @@ public Mono setAccessPolicy(List permissions) {
      *
      * 
    Clear the messages
    
      *
-     * 
    -     * client.clear()
-     *     .subscribe(response -> System.out.printf("Clearing messages completed with status code %d", response.statusCode()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.clearMessages}
      *
      * @return A response that only contains headers and response status code
      * @throws StorageErrorException If the queue doesn't exist
@@ -303,23 +273,11 @@ public Mono> enqueueMessage(String messageText) {
      *
      * 
    Add a message of "Hello, Azure" that has a timeout of 5 seconds
    
      *
-     * 
    -     * client.enqueueMessage("Hello, Azure", Duration.ofSeconds(5), null)
-     *     .subscribe(response -> {
-     *         EnqueuedMessage enqueuedMessage = response.value();
-     *         System.out.printf("Message %s becomes visible at %s", enqueuedMessage.messageId(), enqueuedMessage.timeNextVisible());
-     *     });
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.enqueueMessage#string-duration-duration}
      *
      * 
    Add a message of "Goodbye, Azure" that has a time to live of 5 seconds
    
      *
-     * 
    -     * client.enqueueMessage("Goodbye, Azure", null, Duration.ofSeconds(5))
-     *     .subscribe(response -> {
-     *         EnqueuedMessage enqueuedMessage = response.value();
-     *         System.out.printf("Message %s expires at %s", enqueuedMessage.messageId(), enqueuedMessage.expirationTime());
-     *     });
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.enqueueMessageLiveTime#string-duration-duration}
      *
      * @param messageText Message text
      * @param visibilityTimeout Optional. The timeout period for how long the message is invisible in the queue in seconds.
@@ -367,10 +325,7 @@ public Flux dequeueMessages() {
      *
      * 
    Dequeue up to 5 messages
    
      *
-     * 
    -     * client.dequeueMessages(5)
-     *     .subscribe(result -> System.out.printf("Dequeued %s and it becomes visible at %s" result.messageId(), result.timeNextVisible()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.dequeueMessages#integer}
      *
      * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested
      * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32
@@ -392,10 +347,7 @@ public Flux dequeueMessages(Integer maxMessages) {
      *
      * 
    Dequeue up to 5 messages and give them a 60 second timeout period
    
      *
-     * 
    -     * client.dequeueMessages(5, Duration.ofSeconds(60))
-     *     .subscribe(result -> System.out.printf("Dequeued %s and it becomes visible at %s" result.messageId(), result.timeNextVisible()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.dequeueMessages#integer-duration}
      *
      * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested
      * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
index f6f098839b8a5..ead22e309d9d0 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
@@ -83,10 +83,7 @@ public VoidResponse create() {
      *
      * 
    Create a queue with metadata "queue:metadataMap"
    
      *
-     * 
    -     * VoidResponse response = client.create(Collections.singletonMap("queue", "metadataMap"));
-     * System.out.printf("Create completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.create#map}
      *
      * @param metadata Metadata to associate with the queue
      * @return A response that only contains headers and response status code
@@ -119,10 +116,7 @@ public VoidResponse delete() {
      *
      * 
    Get the properties of the queue
    
      *
-     * 
    -     * QueueProperties properties = client.getProperties().value();
-     * System.out.printf("Metadata: %s, Approximate message count: %d", properties.metadata(), properties.approximateMessagesCount());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.getProperties}
      *
      * @return A response containing a {@link QueueProperties} value which contains the metadata and approximate
      * messages count of the queue.
@@ -141,17 +135,11 @@ public Response getProperties() {
      *
      * 
    Set the queue's metadata to "queue:metadataMap"
    
      *
-     * 
    -     * VoidResponse response = client.setMetadata(Collections.singletonMap("queue", "metadataMap"));
-     * System.out.printf("Setting metadata completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.setMetadata#map}
      *
      * 
    Clear the queue's metadata
    
      *
-     * 
    -     * VoidResponse response = client.setMetadata(null);
-     * System.out.printf("Clearing metadata completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.clearMetadata#map}
      *
      * @param metadata Metadata to set on the queue
      * @return A response that only contains headers and response status code
@@ -168,10 +156,7 @@ public VoidResponse setMetadata(Map metadata) {
      *
      * 
    List the stored access policies
    
      *
-     * 
    -     * for (SignedIdentifier permission : client.getAccessPolicy()) {
-     *     System.out.printf("Access policy %s allows these permissions: %s", permission.id(), permission.accessPolicy().permission());
-     * }
+     * {@codesnippet com.azure.storage.queue.queueClient.getAccessPolicy}
      *
      * @return The stored access policies specified on the queue.
      * @throws StorageErrorException If the queue doesn't exist
@@ -187,16 +172,7 @@ public Iterable getAccessPolicy() {
      *
      * 
    Set a read only stored access policy
    
      *
-     * 
    -     * AccessPolicy policy = new AccessPolicy().permission("r")
-     *     .start(OffsetDateTime.now(ZoneOffset.UTC))
-     *     .expiry(OffsetDateTime.now(ZoneOffset.UTC).addDays(10));
-     *
-     * SignedIdentifier permission = new SignedIdentifier().id("mypolicy").accessPolicy(accessPolicy);
-     *
-     * VoidResponse response = client.setAccessPolicy(Collections.singletonList(permission));
-     * System.out.printf("Setting access policies completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.setAccessPolicy}
      *
      * @param permissions Access policies to set on the queue
      * @return A response that only contains headers and response status code
@@ -214,10 +190,7 @@ public VoidResponse setAccessPolicy(List permissions) {
      *
      * 
    Clear the messages
    
      *
-     * 
    -     * VoidResponse response = client.clear();
-     * System.out.printf("Clearing messages completed with status code %d", response.statusCode());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.clearMessages}
      *
      * @return A response that only contains headers and response status code
      * @throws StorageErrorException If the queue doesn't exist
@@ -252,17 +225,11 @@ public Response enqueueMessage(String messageText) {
      *
      * 
    Add a message of "Hello, Azure" that has a timeout of 5 seconds
    
      *
-     * 
    -     * EnqueuedMessage enqueuedMessage = client.enqueueMessage("Hello, Azure", Duration.ofSeconds(5), null);
-     * System.out.printf("Message %s becomes visible at %s", enqueuedMessage.messageId(), enqueuedMessage.timeNextVisible());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.enqueueMessage#string-duration-duration}
      *
      * 
    Add a message of "Goodbye, Azure" that has a time to live of 5 seconds
    
      *
-     * 
    -     * EnqueuedMessage enqueuedMessage = client.enqueueMessage("Goodbye, Azure", null, Duration.ofSeconds(5));
-     * System.out.printf("Message %s expires at %s", enqueuedMessage.messageId(), enqueuedMessage.expirationTime());
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.enqueueMessageLiveTime#string-duration-duration}
      *
      * @param messageText Message text
      * @param visibilityTimeout Optional. The timeout period for how long the message is invisible in the queue in seconds.
@@ -305,11 +272,7 @@ public Iterable dequeueMessages() {
      *
      * 
    Dequeue up to 5 messages
    
      *
-     * 
    -     * for (DequeuedMessage dequeuedMessage : client.dequeue(5)) {
-     *     System.out.printf("Dequeued %s and it becomes visible at %s", dequeuedMessage.messageId(), dequeuedMessage.timeNextVisible());
-     * }
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.dequeueMessages#integer}
      *
      * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested
      * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32
@@ -331,11 +294,7 @@ public Iterable dequeueMessages(Integer maxMessages) {
      *
      * 
    Dequeue up to 5 messages and give them a 60 second timeout period
    
      *
-     * 
    -     * for (DequeuedMessage dequeuedMessage : client.dequeue(5, Duration.ofSeconds(60))) {
-     *     System.out.printf("Dequeued %s and it becomes visible at %s", dequeuedMessage.messageId(), dequeuedMessage.timeNextVisible());
-     * }
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.dequeueMessages#integer-duration}
      *
      * @param maxMessages Optional. Maximum number of messages to get, if there are less messages exist in the queue than requested
      * all the messages will be returned. If left empty only 1 message will be retrieved, the allowed range is 1 to 32
@@ -380,11 +339,7 @@ public Iterable peekMessages() {
      *
      * 
    Peek up to the first five messages
    
      *
-     * 
    -     * for (PeekedMessage peekedMessage : client.peekMessages(5)) {
-     *     System.out.printf("Peeked message %s has been dequeued %d times", peekedMessage.messageId(), peekedMessage.dequeueCount());
-     * }
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueClient.peekMessages#integer}
      *
      * @param maxMessages Optional. Maximum number of messages to peek, if there are less messages exist in the queue than requested
      * all the messages will be peeked. If left empty only 1 message will be peeked, the allowed range is 1 to 32
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
index a115419ee67fa..8c6353a8596bd 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
@@ -12,9 +12,19 @@
 import com.azure.storage.queue.QueueServiceAsyncClient;
 import com.azure.storage.queue.QueueServiceClient;
 import com.azure.storage.queue.QueueServiceClientBuilder;
+import com.azure.storage.queue.models.AccessPolicy;
+import com.azure.storage.queue.models.DequeuedMessage;
 import com.azure.storage.queue.models.EnqueuedMessage;
+import com.azure.storage.queue.models.QueueProperties;
+import com.azure.storage.queue.models.SignedIdentifier;
+import com.azure.storage.queue.models.StorageServiceProperties;
 import com.azure.storage.queue.models.UpdatedMessage;
 import java.time.Duration;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Contains code snippets when generating javadocs through doclets for {@link QueueClient} and {@link QueueAsyncClient}.
@@ -132,6 +142,30 @@ public void createQueueAsync() {
         // END: com.azure.storage.queue.queueAsyncClient.create
     }
 
+    /**
+     * Generates a code sample for using {@link QueueClient#create(Map)}
+     */
+    public void createQueueMaxOverload() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.create#map
+        VoidResponse response = queueClient.create(Collections.singletonMap("queue", "metadataMap"));
+        System.out.println("Complete creating queue with status code: " + response.statusCode());
+        // END: com.azure.storage.queue.queueClient.create#map
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#create(Map)}
+     */
+    public void createQueueAsyncMaxOverload() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.create#map
+        queueAsyncClient.create(Collections.singletonMap("queue", "metadataMap")).subscribe(
+            response -> { },
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete creating the queue!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.create#map
+    }
 
     /**
      * Generates a code sample for using {@link QueueClient#enqueueMessage(String)}
@@ -150,7 +184,7 @@ public void enqueueMessage() {
     public void enqueueMessageAsync() {
         QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
         // BEGIN: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string
-        queueAsyncClient.enqueueMessage("hello msg").subscribe(
+        queueAsyncClient.enqueueMessage("Hello, Azure").subscribe(
             response -> { },
             error -> System.err.print(error.toString()),
             () -> System.out.println("Complete enqueuing the message!")
@@ -158,6 +192,62 @@ public void enqueueMessageAsync() {
         // END: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string
     }
 
+    /**
+     * Generates a code sample for using {@link QueueClient#enqueueMessage(String, Duration, Duration)}
+     */
+    public void enqueueMessageWithTimeoutOverload() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.enqueueMessage#string-duration-duration
+        EnqueuedMessage enqueuedMessage = queueClient.enqueueMessage("Hello, Azure",
+            Duration.ofSeconds(5), null).value();
+        System.out.printf("Message %s expires at %s", enqueuedMessage.messageId(), enqueuedMessage.expirationTime());
+        // END: com.azure.storage.queue.queueClient.enqueueMessage#string-duration-duration
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#enqueueMessage(String, Duration, Duration)}
+     */
+    public void enqueueMessageAsyncWithTimeoutOverload() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string-duration-duration
+        queueAsyncClient.enqueueMessage("Hello, Azure",
+            Duration.ofSeconds(5), null).subscribe(
+            response -> System.out.printf("Message %s expires at %s", response.value().messageId(),
+                response.value().expirationTime()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete enqueuing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string-duration-duration
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#enqueueMessage(String, Duration, Duration)}
+     */
+    public void enqueueMessageWithLiveTimeOverload() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.enqueueMessageLiveTime#string-duration-duration
+        EnqueuedMessage enqueuedMessage = queueClient.enqueueMessage("Goodbye, Azure",
+            null, Duration.ofSeconds(5)).value();
+        System.out.printf("Message %s expires at %s", enqueuedMessage.messageId(), enqueuedMessage.expirationTime());
+        // END: com.azure.storage.queue.queueClient.enqueueMessageLiveTime#string-duration-duration
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#enqueueMessage(String, Duration, Duration)}
+     */
+    public void enqueueMessageAsyncWithLiveTimeOverload() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.enqueueMessageLiveTime#string-duration-duration
+        queueAsyncClient.enqueueMessage("Goodbye, Azure",
+            null, Duration.ofSeconds(5)).subscribe(
+            response -> System.out.printf("Message %s expires at %s", response.value().messageId(),
+                response.value().expirationTime()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete enqueuing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.enqueueMessageLiveTime#string-duration-duration
+    }
+
     /**
      * Generates a code sample for using {@link QueueClient#dequeueMessages()}
      */
@@ -188,6 +278,62 @@ public void dequeueMessageAsync() {
         // END: com.azure.storage.queue.queueAsyncClient.dequeueMessages
     }
 
+    /**
+     * Generates a code sample for using {@link QueueClient#dequeueMessages(Integer)}
+     */
+    public void dequeueMessageWithOverload() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.dequeueMessages#integer
+        for (DequeuedMessage dequeuedMessage : queueClient.dequeueMessages(5)) {
+            System.out.printf("Dequeued %s and it becomes visible at %s",
+                dequeuedMessage.messageId(), dequeuedMessage.timeNextVisible());
+        }
+        // END: com.azure.storage.queue.queueClient.dequeueMessages#integer
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#dequeueMessages(Integer)}
+     */
+    public void dequeueMessageAsyncWithOverload() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.dequeueMessages#integer
+        queueAsyncClient.dequeueMessages(5).subscribe(
+            dequeuedMessage -> System.out.println("The message got from dequeue operation: "
+                + dequeuedMessage.messageText()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete dequeuing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.dequeueMessages#integer
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#dequeueMessages(Integer, Duration)}
+     */
+    public void dequeueMessageMaxOverload() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.dequeueMessages#integer-duration
+        for (DequeuedMessage dequeuedMessage : queueClient.dequeueMessages(5, Duration.ofSeconds(60))) {
+            System.out.printf("Dequeued %s and it becomes visible at %s",
+                dequeuedMessage.messageId(), dequeuedMessage.timeNextVisible());
+        }
+        // END: com.azure.storage.queue.queueClient.dequeueMessages#integer-duration
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#dequeueMessages(Integer, Duration)}
+     */
+    public void dequeueMessageAsyncMaxOverload() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.dequeueMessages#integer-duration
+        queueAsyncClient.dequeueMessages(5, Duration.ofSeconds(60)).subscribe(
+            dequeuedMessage -> System.out.println("The message got from dequeue operation: "
+                + dequeuedMessage.messageText()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete dequeuing the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.dequeueMessages#integer-duration
+    }
+
     /**
      * Generates a code sample for using {@link QueueClient#peekMessages()}
      */
@@ -217,6 +363,35 @@ public void peekMessageAsync() {
         // END: com.azure.storage.queue.queueAsyncClient.peekMessages
     }
 
+    /**
+     * Generates a code sample for using {@link QueueClient#peekMessages(Integer)}
+     */
+    public void peekMessageMaxOverload() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.peekMessages#integer
+        queueClient.peekMessages(5).forEach(
+            peekMessage -> System.out.printf("Peeked message %s has been dequeued %d times",
+                peekMessage.messageId(), peekMessage.dequeueCount())
+        );
+        // END: com.azure.storage.queue.queueClient.peekMessages#integer
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#peekMessages(Integer)}
+     */
+    public void peekMessageAsyncMaxOverload() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.peekMessages#integer
+        queueAsyncClient.peekMessages(5).subscribe(
+            peekMessage -> System.out.printf("Peeked message %s has been dequeued %d times",
+                peekMessage.messageId(), peekMessage.dequeueCount()),
+            error -> System.err.print(error.toString()),
+            () -> System.out.println("Complete peeking the message!")
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.peekMessages#integer
+    }
+
     /**
      * Generates a code sample for using {@link QueueClient#updateMessage(String, String, String, Duration)}
      */
@@ -315,4 +490,159 @@ public void deleteQueueAsync() {
         );
         // END: com.azure.storage.queue.queueAsyncClient.delete
     }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#getProperties()}
+     */
+    public void getProperties() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.getProperties
+        QueueProperties properties = queueClient.getProperties().value();
+        System.out.printf("Metadata: %s, Approximate message count: %d", properties.metadata(),
+            properties.approximateMessagesCount());
+        // END: com.azure.storage.queue.queueClient.getProperties
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#getProperties()}
+     */
+    public void getPropertiesAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.getProperties
+        queueAsyncClient.getProperties()
+            .subscribe(response -> {
+                QueueProperties properties = response.value();
+                System.out.printf("Metadata: %s, Approximate message count: %d", properties.metadata(),
+                    properties.approximateMessagesCount());
+            });
+        // END: com.azure.storage.queue.queueAsyncClient.getProperties
+    }
+
+    /**
+     * Generate a code sample for using {@link QueueClient#setMetadata(Map)} to set metadata.
+     */
+    public void setMetadata() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.setMetadata#map
+        VoidResponse response = queueClient.setMetadata(Collections.singletonMap("queue", "metadataMap"));
+        System.out.printf("Setting metadata completed with status code %d", response.statusCode());
+        // END: com.azure.storage.queue.queueClient.setMetadata#map
+    }
+
+    /**
+     * Generate a code sample for using {@link QueueAsyncClient#setMetadata(Map)} to set metadata.
+     */
+    public void setMetadataAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.setMetadata#map
+        queueAsyncClient.setMetadata(Collections.singletonMap("queue", "metadataMap"))
+            .subscribe(response -> System.out.printf("Setting metadata completed with status code %d",
+                response.statusCode()));
+        // END: com.azure.storage.queue.queueAsyncClient.setMetadata#map
+    }
+
+    /**
+     * Generate a code sample for using {@link QueueClient#setMetadata(Map)} to clear metadata.
+     */
+    public void clearMetadata() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.clearMetadata#map
+        VoidResponse response = queueClient.setMetadata(null);
+        System.out.printf("Clearing metadata completed with status code %d", response.statusCode());
+        // END: com.azure.storage.queue.queueClient.clearMetadata#map
+    }
+
+    /**
+     * Generate a code sample for using {@link QueueAsyncClient#setMetadata(Map)}
+     */
+    public void clearMetadataAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.clearMetadata#map to clear metadata.
+        queueAsyncClient.setMetadata(null)
+            .subscribe(response -> System.out.printf("Clearing metadata completed with status code %d",
+                response.statusCode()));
+        // END: com.azure.storage.queue.queueAsyncClient.clearMetadata#map
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#getAccessPolicy()}
+     */
+    public void getAccessPolicy() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.getAccessPolicy
+        for (SignedIdentifier permission : queueClient.getAccessPolicy()) {
+          System.out.printf("Access policy %s allows these permissions: %s", permission.id(),
+              permission.accessPolicy().permission());
+        }
+        // END: com.azure.storage.queue.queueClient.getAccessPolicy
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#getAccessPolicy()}
+     */
+    public void getAccessPolicyAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.getAccessPolicy
+        queueAsyncClient.getAccessPolicy()
+            .subscribe(result -> System.out.printf("Access policy %s allows these permissions: %s",
+                result.id(), result.accessPolicy().permission()));
+        // END: com.azure.storage.queue.queueAsyncClient.getAccessPolicy
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#setAccessPolicy(List)}
+     */
+    public void setAccessPolicy() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.setAccessPolicy
+        AccessPolicy accessPolicy = new AccessPolicy().permission("r")
+            .start(OffsetDateTime.now(ZoneOffset.UTC))
+            .expiry(OffsetDateTime.now(ZoneOffset.UTC).plusDays(10));
+        SignedIdentifier permission = new SignedIdentifier().id("mypolicy").accessPolicy(accessPolicy);
+        VoidResponse response = queueClient.setAccessPolicy(Collections.singletonList(permission));
+        System.out.printf("Setting access policies completed with status code %d", response.statusCode());
+        // END: com.azure.storage.queue.queueClient.setAccessPolicy
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#setAccessPolicy(List)}
+     */
+    public void setAccessPolicyAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.setAccessPolicy
+        AccessPolicy accessPolicy = new AccessPolicy().permission("r")
+            .start(OffsetDateTime.now(ZoneOffset.UTC))
+            .expiry(OffsetDateTime.now(ZoneOffset.UTC).plusDays(10));
+
+        SignedIdentifier permission = new SignedIdentifier().id("mypolicy").accessPolicy(accessPolicy);
+        queueAsyncClient.setAccessPolicy(Collections.singletonList(permission))
+            .subscribe(response -> System.out.printf("Setting access policies completed with status code %d",
+                response.statusCode()));
+        // END: com.azure.storage.queue.queueAsyncClient.setAccessPolicy
+    }
+
+    /**
+     * Generates a code sample for using {@link QueueClient#clearMessages()}
+     */
+    public void clearMessages() {
+        QueueClient queueClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueClient.clearMessages
+        VoidResponse response = queueClient.clearMessages();
+        System.out.printf("Clearing messages completed with status code %d", response.statusCode());
+        // END: com.azure.storage.queue.queueClient.clearMessages
+    }
+
+
+    /**
+     * Generates a code sample for using {@link QueueAsyncClient#clearMessages()}
+     */
+    public void clearMessagesAsync() {
+        QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.clearMessages
+        queueAsyncClient.clearMessages().subscribe(
+            response -> System.out.println("Clearing messages completed with status code: " + response.statusCode())
+        );
+        // END: com.azure.storage.queue.queueAsyncClient.clearMessages
+    }
+
 }

From 9db31b924d458439c53d0db535f69d138ecd3e7c Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Mon, 15 Jul 2019 18:21:32 -0700
Subject: [PATCH 12/16] Make minor changes and fix checkstyle.

---
 storage/client/queue/README.md                | 28 ++++++++++---------
 .../azure/storage/queue/QueueAsyncClient.java |  2 +-
 .../queue/QueueServiceAsyncClient.java        |  2 +-
 .../storage/queue/QueueServiceClient.java     |  2 +-
 .../javadoc/QueueJavaDocCodeSamples.java      | 28 ++++++++-----------
 .../QueueServiceJavaDocCodeSamples.java       |  8 +++---
 .../storage/queue/QueueAsyncClientTests.java  |  2 +-
 .../azure/storage/queue/QueueClientTests.java |  6 ++--
 .../com/azure/storage/queue/TestHelpers.java  |  9 +++++-
 9 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/storage/client/queue/README.md b/storage/client/queue/README.md
index dd4f4ef16ad56..64884fce3f558 100644
--- a/storage/client/queue/README.md
+++ b/storage/client/queue/README.md
@@ -220,7 +220,7 @@ queueServiceClient.listQueuesSegment(marker, options).forEach{
 Get queue properties in account, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
 ```Java
 String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueURL).build();
 
 Response properties = queueServiceClient.getProperties();
 ```
@@ -230,7 +230,7 @@ Response properties = queueServiceClient.getProperties
 Set queue properties in account, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
 ```Java
 String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueURL).build();
 
 StorageServiceProperties properties = new StorageServiceProperties() {
     // logging: some logging;
@@ -247,7 +247,7 @@ he `Get Queue Service Stats` operation retrieves statistics related to replicati
 It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.
 ```Java
 String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueURL).build();
 
 Response queueStats = queueServiceClient.getStatistics();
 ```
@@ -257,7 +257,7 @@ The operation adds a new message to the back of the message queue. A visibility
 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.
 ```Java
 String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
 
 queueClient.enqueueMessage("myMessage");
 ```
@@ -266,7 +266,7 @@ queueClient.enqueueMessage("myMessage");
 The operation updates a message in the message queue. 
 ```Java
 String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
 // @param messageId Id of the message
 // @param popReceipt Unique identifier that must match the message for it to be updated
 // @param visibilityTimeout How long the message will be invisible in the queue in seconds
@@ -277,7 +277,7 @@ queueClient.updateMessage(messageId, "new message", popReceipt, visibilityTimeou
 The operation retrieves one or more messages from the front of the queue.
 ```Java
 String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
 
 queueClient.peekMessages().forEach(message-> {print message.messageText();});
 ```
@@ -287,7 +287,7 @@ queueClient.peekMessages().forEach(message-> {print message.messageText();});
 The operation retrieves one or more messages from the front of the queue.
 ```Java
 String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
 
 queueClient.dequeueMessage("myMessage").forEach(message-> {print message.messageText();});
 ```
@@ -297,7 +297,7 @@ queueClient.dequeueMessage("myMessage").forEach(message-> {print message.message
 The operation retrieves one or more messages from the front of the queue.
 ```Java
 String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
 
 queueClient.deleteMessage(messageId, popReceipt);
 ```
@@ -306,7 +306,7 @@ queueClient.deleteMessage(messageId, popReceipt);
 The operation retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated with the queue as name-values pairs.
 ```Java
 String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
 
 Response properties = queueClient.getProperties();
 ```
@@ -334,10 +334,11 @@ When you interact with queue using this Java client library, errors returned by
 ## Next steps
 
 ### More Samples
-- QueueServiceSample
-- MessageSample
-- QueueExceptionSample
-- AsyncSample
+Get started with our [Queue samples][samples]:
+- [QueueServiceSample](src/samples/java/blob/QueueServiceSample.java): Create, list and delete queues
+- [MessageSample](src/samples/java/blob/MessageSample.java): Enqueue, peek dequeue, update, clear and delete messages. Get properties of the queue.
+- [QueueExceptionSample](src/samples/java/blob/QueueExceptionSample.java): Handle the exceptions from storage queue service side.
+- [AsyncSample](src/samples/java/blob/AsyncSample.java): Create queue and enqueue message using async queue client call.
 
 [Quickstart: Create a Java Spring app with App Configuration](https://docs.microsoft.com/en-us/azure/azure-app-configuration/quickstart-java-spring-app)
 
@@ -374,3 +375,4 @@ If you would like to become an active contributor to this project please follow
 [azure_cli]: https://docs.microsoft.com/cli/azure
 [sas_token]: https://docs.microsoft.com/en-us/azure/storage/common/storage-dotnet-shared-access-signature-part-1
 [storage_rest]: https://docs.microsoft.com/en-us/rest/api/storageservices/queue-service-error-codes
+[samples]: samples/
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
index 09662cf1c0d6b..a676e375e15ef 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -201,7 +201,7 @@ public Mono setMetadata(Map metadata) {
      *
      * 
    List the stored access policies
    
      *
-     * {@codesnippet com.azure.storage.queue.queueAsyncClient.getAccessPolicy
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.getAccessPolicy}
      *
      * @return The stored access policies specified on the queue.
      * @throws StorageErrorException If the queue doesn't exist
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
index 6bff4084c9fe0..809f2091a20c6 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
@@ -293,7 +293,7 @@ public Mono setProperties(StorageServiceProperties properties) {
      *
      * 
    Retrieve the geo replication information
    
      *
-     * {@codesnipeet com.azure.storage.queue.queueServiceAsyncClient.getStatistics}
+     * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.getStatistics}
      *
      * @return The geo replication information about the Queue service
      */
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
index 98c5a4b06b075..3fbe9521bcfca 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
@@ -229,7 +229,7 @@ public VoidResponse setProperties(StorageServiceProperties properties) {
      *
      * 
    Retrieve the geo replication information
    
      *
-     * {@codesnipeet com.azure.storage.queue.queueServiceClient.getStatistics}
+     * {@codesnippet com.azure.storage.queue.queueServiceClient.getStatistics}
      *
      * @return The geo replication information about the Queue service
      */
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
index 8c6353a8596bd..711572eff5b8c 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
@@ -9,15 +9,11 @@
 import com.azure.storage.queue.QueueAsyncClient;
 import com.azure.storage.queue.QueueClient;
 import com.azure.storage.queue.QueueClientBuilder;
-import com.azure.storage.queue.QueueServiceAsyncClient;
-import com.azure.storage.queue.QueueServiceClient;
-import com.azure.storage.queue.QueueServiceClientBuilder;
 import com.azure.storage.queue.models.AccessPolicy;
 import com.azure.storage.queue.models.DequeuedMessage;
 import com.azure.storage.queue.models.EnqueuedMessage;
 import com.azure.storage.queue.models.QueueProperties;
 import com.azure.storage.queue.models.SignedIdentifier;
-import com.azure.storage.queue.models.StorageServiceProperties;
 import com.azure.storage.queue.models.UpdatedMessage;
 import java.time.Duration;
 import java.time.OffsetDateTime;
@@ -212,10 +208,10 @@ public void enqueueMessageAsyncWithTimeoutOverload() {
         // BEGIN: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string-duration-duration
         queueAsyncClient.enqueueMessage("Hello, Azure",
             Duration.ofSeconds(5), null).subscribe(
-            response -> System.out.printf("Message %s expires at %s", response.value().messageId(),
-                response.value().expirationTime()),
-            error -> System.err.print(error.toString()),
-            () -> System.out.println("Complete enqueuing the message!")
+                response -> System.out.printf("Message %s expires at %s", response.value().messageId(),
+                    response.value().expirationTime()),
+                error -> System.err.print(error.toString()),
+                () -> System.out.println("Complete enqueuing the message!")
         );
         // END: com.azure.storage.queue.queueAsyncClient.enqueueMessage#string-duration-duration
     }
@@ -240,10 +236,10 @@ public void enqueueMessageAsyncWithLiveTimeOverload() {
         // BEGIN: com.azure.storage.queue.queueAsyncClient.enqueueMessageLiveTime#string-duration-duration
         queueAsyncClient.enqueueMessage("Goodbye, Azure",
             null, Duration.ofSeconds(5)).subscribe(
-            response -> System.out.printf("Message %s expires at %s", response.value().messageId(),
-                response.value().expirationTime()),
-            error -> System.err.print(error.toString()),
-            () -> System.out.println("Complete enqueuing the message!")
+                response -> System.out.printf("Message %s expires at %s", response.value().messageId(),
+                    response.value().expirationTime()),
+                error -> System.err.print(error.toString()),
+                () -> System.out.println("Complete enqueuing the message!")
         );
         // END: com.azure.storage.queue.queueAsyncClient.enqueueMessageLiveTime#string-duration-duration
     }
@@ -553,11 +549,11 @@ public void clearMetadata() {
     }
 
     /**
-     * Generate a code sample for using {@link QueueAsyncClient#setMetadata(Map)}
+     * Generate a code sample for using {@link QueueAsyncClient#setMetadata(Map)} to clear metadata.
      */
     public void clearMetadataAsync() {
         QueueAsyncClient queueAsyncClient = createAsyncClientWithSASToken();
-        // BEGIN: com.azure.storage.queue.queueAsyncClient.clearMetadata#map to clear metadata.
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.clearMetadata#map
         queueAsyncClient.setMetadata(null)
             .subscribe(response -> System.out.printf("Clearing metadata completed with status code %d",
                 response.statusCode()));
@@ -571,8 +567,8 @@ public void getAccessPolicy() {
         QueueClient queueClient = createClientWithSASToken();
         // BEGIN: com.azure.storage.queue.queueClient.getAccessPolicy
         for (SignedIdentifier permission : queueClient.getAccessPolicy()) {
-          System.out.printf("Access policy %s allows these permissions: %s", permission.id(),
-              permission.accessPolicy().permission());
+            System.out.printf("Access policy %s allows these permissions: %s", permission.id(),
+                permission.accessPolicy().permission());
         }
         // END: com.azure.storage.queue.queueClient.getAccessPolicy
     }
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
index d6049412316c0..b81802e2cbf3e 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
@@ -150,10 +150,10 @@ public void createQueueAsyncMaxOverload() {
         // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.createQueue#string-map
         queueServiceAsyncClient.createQueue("myqueue", Collections.singletonMap("queue", "metadata"))
             .subscribe(
-            response -> System.out.printf("Creating the queue with status code %d", response.statusCode()),
-            error -> System.err.print(error.toString()),
-            () -> System.out.println("Complete creating the queue!")
-        );
+                response -> System.out.printf("Creating the queue with status code %d", response.statusCode()),
+                error -> System.err.print(error.toString()),
+                () -> System.out.println("Complete creating the queue!")
+            );
         // END: com.azure.storage.queue.queueServiceAsyncClient.createQueue#string-map
     }
 
diff --git a/storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
index a157ebffce34e..f658e2aff324b 100644
--- a/storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
@@ -136,7 +136,7 @@ public void deleteExisting() {
             .assertNext(response -> helper.assertResponseStatusCode(response, 204))
             .verifyComplete();
 
-        helper.sleep(Duration.ofSeconds(30));
+        helper.sleepInRecordMode(Duration.ofSeconds(30));
 
         StepVerifier.create(client.enqueueMessage("This should fail"))
             .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
diff --git a/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
index a440c8f879f26..c0da15213d8c7 100644
--- a/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
@@ -123,7 +123,7 @@ public void deleteExisting() {
         helper.assertResponseStatusCode(client.enqueueMessage("This queue will be deleted"), 201);
         helper.assertResponseStatusCode(client.delete(), 204);
 
-        helper.sleep(Duration.ofSeconds(30));
+        helper.sleepInRecordMode(Duration.ofSeconds(30));
 
         try {
             client.enqueueMessage("This should fail");
@@ -365,7 +365,7 @@ public void enqueueShortTimeToLiveMessage() {
         String messageText = "test message";
         helper.assertResponseStatusCode(client.enqueueMessage(messageText, Duration.ofSeconds(0), Duration.ofSeconds(2)), 201);
 
-        helper.sleep(Duration.ofSeconds(5));
+        helper.sleepInRecordMode(Duration.ofSeconds(5));
         Iterator response = client.peekMessages().iterator();
         assertFalse(response.hasNext());
     }
@@ -592,7 +592,7 @@ public void updateMessage() {
         Response updatedMessageResponse = client.updateMessage(updatedMessageText, message.messageId(), message.popReceipt(), Duration.ofSeconds(1));
         helper.assertResponseStatusCode(updatedMessageResponse, 204);
 
-        helper.sleep(Duration.ofSeconds(2));
+        helper.sleepInRecordMode(Duration.ofSeconds(2));
 
         Iterator peekedMessageIterator = client.peekMessages().iterator();
         PeekedMessage peekedMessage = peekedMessageIterator.next();
diff --git a/storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java b/storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java
index d414f13d194dc..bac3f552860fa 100644
--- a/storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java
+++ b/storage/client/queue/src/test/java/com/azure/storage/queue/TestHelpers.java
@@ -144,11 +144,18 @@ void assertExceptionStatusCode(Throwable throwable, int expectedStatusCode) {
         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 errror
+            // Ignore the error
         }
     }
 }

From 4788a1348c4cf37ed2a4d856d36513106171e99d Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Thu, 18 Jul 2019 14:24:55 -0700
Subject: [PATCH 13/16] Addressed comments.

---
 eng/jacoco-test-coverage/pom.xml              |  13 +--
 eng/spotbugs-aggregate-report/pom.xml         |  13 +--
 pom.client.xml                                |  12 +-
 storage/client/queue/README.md                | 107 ++++++++++++------
 storage/client/queue/pom.xml                  |  15 ---
 .../credentials/SharedKeyCredential.java      |   5 +
 .../policy/AnonymousCredentialPolicy.java     |  34 ------
 .../azure/storage/queue/QueueAsyncClient.java |   3 +
 .../storage/queue/QueueClientBuilder.java     |  10 +-
 .../queue/QueueServiceAsyncClient.java        |   3 +
 .../queue/QueueServiceClientBuilder.java      |   8 +-
 .../azure/storage/queue}/package-info.java    |   0
 12 files changed, 111 insertions(+), 112 deletions(-)
 delete mode 100644 storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java
 rename storage/client/queue/{ => src/main/java/com/azure/storage/queue}/package-info.java (100%)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 47e624ba1acac..cee087f22d298 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -31,8 +31,8 @@
     1.0.0-preview.1
     4.0.0-preview.1
     5.0.0-preview.2
-    12.0.0-preview.1
     12.0.0-preview.1
+    12.0.0-preview.1
   
 
   
@@ -89,17 +89,16 @@
       azure-messaging-eventhubs
       ${azure-messaging-eventhubs.version}
     
-    
-      com.azure
-      azure-storage-queue
-      ${azure-storage-queue.version}
-    
 
 
 
 
 
-
+    
+      com.azure
+      azure-storage-queue
+      ${azure-storage-queue.version}
+    
     
     
diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
index f9463e3e7d285..f390bb0c7db4c 100644
--- a/eng/spotbugs-aggregate-report/pom.xml
+++ b/eng/spotbugs-aggregate-report/pom.xml
@@ -29,8 +29,8 @@
     1.0.0-preview.1
     4.0.0-preview.1
     5.0.0-preview.2
-    12.0.0-preview.1
     12.0.0-preview.1
+    12.0.0-preview.1
   
   
     
@@ -163,11 +163,6 @@
           azure-messaging-eventhubs
           ${azure-messaging-eventhubs.version}
         
-        
-          com.azure
-          azure-storage-queue
-          ${azure-storage-queue.version}
-        
         
           com.azure
           azure-identity
@@ -188,7 +183,11 @@
 
 
 
-
+        
+          com.azure
+          azure-storage-queue
+          ${azure-storage-queue.version}
+        
         
diff --git a/pom.client.xml b/pom.client.xml
index df496e15ef291..d4f2f08341ff4 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -393,10 +393,6 @@
                 Azure Storage - Blobs
                 com.azure.storage.blob*
               
-              
-                Azure Storage - Queues
-                com.azure.storage.client.queue*
-              
             
             
               https://docs.oracle.com/javase/8/docs/api/
@@ -547,11 +543,11 @@
               -maxLineLength 120
                 -snippetpath ${project.basedir}/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java
                 -snippetpath ${project.basedir}/core/azure-core/src/samples/java
-                -snippetpath ${project.basedir}/eventhubs/client/azure-eventhubs/src/samples/java
-                -snippetpath ${project.basedir}/keyvault/client/keys/src/samples/java
-                -snippetpath ${project.basedir}/keyvault/client/secrets/src/samples/java
+                -snippetpath ${project.basedir}/sdk/eventhubs/azure-eventhubs/src/samples/java
+                -snippetpath ${project.basedir}/sdk/keyvault/azure-keyvault-keys/src/samples/java
+                -snippetpath ${project.basedir}/sdk/keyvault/azure-keyvault-secrets/src/samples/java
+                
                 -snippetpath ${project.basedir}/storage/client/queue/src/samples/java
-
               
             
           
diff --git a/storage/client/queue/README.md b/storage/client/queue/README.md
index 64884fce3f558..07180efd5d775 100644
--- a/storage/client/queue/README.md
+++ b/storage/client/queue/README.md
@@ -26,9 +26,7 @@ A single queue message can be up to 64 KB in size, and a queue can contain milli
 To create a Storage Account you can use the Azure Portal or [Azure CLI][azure_cli].
 
 ```Powershell
-az group create \
-    --name storage-resource-group \
-    --location westus
+az group create --name storage-resource-group --location westus
 ```
 
 ### Authenticate the client
@@ -169,6 +167,7 @@ queueAsyncClient.create(metadata, timeout).subscribe(
 ## Examples
 
 The following sections provide several code snippets covering some of the most common Configuration Service tasks, including:
+- [Build a client](#build-a-client)
 - [Create a Queue](#Create-a-queue)
 - [Delete a queue](#Delete-a-queue)
 - [List the queues in account](#List-queues-in-account)
@@ -182,32 +181,54 @@ The following sections provide several code snippets covering some of the most c
 - [Delete message from a queue](#Delete-message-from-a-queue)
 - [Get a Queue properties](#Get-a-queue-properties)
 - [Set/Update a Queue metadata](#Set-a-queue-metadata)
+
+### Build a client
+We have two ways of building QueueService or Queue Client. Here will take queueServiceClient as an example. Same things apply to queueClient.
+
+First, build client from full URL/endpoint (e.g. with queueName, with SASToken and etc.)
+
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).buildClient();
+```
+
+Or
+
+We can build the queueServiceClient from the builder using `${SASToken}` as credential.
+
+```Java
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).credential(SASToken).buildClient();
+```
+
 ### Create a queue
 
-Create a queue in the Storage Account. Throws StorageErrorException If the queue fails to be created.
+Create a queue in the Storage Account using `${SASToken}` as credential. 
+Throws StorageErrorException If the queue fails to be created.
 
 ```Java
-String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).credential(SASToken).buildClient();
 
 QueueClient newQueueServiceClient = queueServiceClient.createQueue("myqueue");
 ```
 ### Delete a queue
 
-Delete a queue in the Storage Account. Throws StorageErrorException If the queue fails to be deleted.
+Delete a queue in the Storage Account using `${SASToken}` as credential. 
+Throws StorageErrorException If the queue fails to be deleted.
 ```Java
-String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).credential(SASToken).buildClient();
 
 QueueClient newQueueServiceClient = queueServiceClient.deleteQueue("myqueue");
 ```
 
 ### List queues in account
 
-List all the queues in account.
+List all the queues in account using `${SASToken}` as credential.
 ```Java
-String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).credential(SASToken).buildClient();
 // @param marker: Starting point to list the queues
 // @param options: Filter for queue selection
 queueServiceClient.listQueuesSegment(marker, options).forEach{
@@ -218,9 +239,11 @@ queueServiceClient.listQueuesSegment(marker, options).forEach{
 ### Get properties in queue account
 
 Get queue properties in account, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+Use `${SASToken}` as credential.
 ```Java
-String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueURL).build();
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).credential(SASToken).buildClient();
 
 Response properties = queueServiceClient.getProperties();
 ```
@@ -228,9 +251,11 @@ Response properties = queueServiceClient.getProperties
 ### Set properties in queue account
 
 Set queue properties in account, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+Use `${SASToken}` as credential.
 ```Java
-String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueURL).build();
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).credential(SASToken).buildClient();
 
 StorageServiceProperties properties = new StorageServiceProperties() {
     // logging: some logging;
@@ -243,30 +268,34 @@ queueServiceClient.setProperties(properties);
 ```
 
 ### Get queue service statistics 
-he `Get Queue Service Stats` operation retrieves statistics related to replication for the Queue service. 
+The `Get Queue Service Stats` operation retrieves statistics related to replication for the Queue service. 
+
+Use `${SASToken}` as credential.
 It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.
 ```Java
-String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueURL).build();
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueServiceURL).credential(SASToken).buildClient();
 
 Response queueStats = queueServiceClient.getStatistics();
 ```
 
 ### Enqueue message into a queue
 The 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. 
+
+Use `${SASToken}` as credential.
 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.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
+String queueSURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).credential(SASToken).queueName("myqueue").buildClient();
 
 queueClient.enqueueMessage("myMessage");
 ```
 
 ### Update messaged from a queue
-The operation updates a message in the message queue. 
+The operation updates a message in the message queue. Use `${SASToken}` as credential.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
+String queueSURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).credential(SASToken).queueName("myqueue").buildClient();
 // @param messageId Id of the message
 // @param popReceipt Unique identifier that must match the message for it to be updated
 // @param visibilityTimeout How long the message will be invisible in the queue in seconds
@@ -274,48 +303,52 @@ queueClient.updateMessage(messageId, "new message", popReceipt, visibilityTimeou
 ```
 
 ### Peek messages from a queue
-The operation retrieves one or more messages from the front of the queue.
+The operation retrieves one or more messages from the front of the queue. Use `${SASToken}` as credential.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
+String queueSURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).credential(SASToken).queueName("myqueue").buildClient();
 
 queueClient.peekMessages().forEach(message-> {print message.messageText();});
 ```
 
 
 ### Dequeue messages from a queue
-The operation retrieves one or more messages from the front of the queue.
+The operation retrieves one or more messages from the front of the queue. Use `${SASToken}` as credential.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
+String queueSURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).credential(SASToken).queueName("myqueue").buildClient();
 
 queueClient.dequeueMessage("myMessage").forEach(message-> {print message.messageText();});
 ```
 
 
 ### Delete message from a queue
-The operation retrieves one or more messages from the front of the queue.
+The operation retrieves one or more messages from the front of the queue. Use `${SASToken}` as credential.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
+String queueSURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).credential(SASToken).queueName("myqueue").buildClient();
 
 queueClient.deleteMessage(messageId, popReceipt);
 ```
 
 ### Get a queue properties
 The operation retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated with the queue as name-values pairs.
+
+Use `${SASToken}` as credential.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).build();
+String queueSURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).credential(SASToken).queueName("myqueue").buildClient();
 
 Response properties = queueClient.getProperties();
 ```
 
 ### Set a queue metadata
 The operation sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.
+
+Use `${SASToken}` as credential.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+String queueSURL = String.format("https://%s.queue.core.windows.net", accountName);
+QueueClient queueClient = new QueueClientBuilder().endpoint(queueURL).credential(SASToken).queueName("myqueue").buildClient();
 
 Map metadata =  new HashMap<>() {{
     put("key1", "val1");
diff --git a/storage/client/queue/pom.xml b/storage/client/queue/pom.xml
index 7e5846edf40ad..c018da31ab260 100644
--- a/storage/client/queue/pom.xml
+++ b/storage/client/queue/pom.xml
@@ -74,20 +74,5 @@
       adal4j
       test
     
-    
-      org.spockframework
-      spock-core
-      test
-    
-    
-      cglib
-      cglib-nodep
-      test
-    
-    
-      uk.org.lidalia
-      slf4j-test
-      test
-    
   
 
diff --git a/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java b/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java
index 2b5f5d5f3cf5f..db8045e723a1a 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/common/credentials/SharedKeyCredential.java
@@ -4,6 +4,7 @@
 package com.azure.storage.common.credentials;
 
 import com.azure.core.implementation.util.ImplUtils;
+import com.azure.core.util.logging.ClientLogger;
 import io.netty.handler.codec.http.QueryStringDecoder;
 
 import javax.crypto.Mac;
@@ -26,6 +27,7 @@
  * SharedKey credential policy that is put into a header to authorize requests.
  */
 public final class SharedKeyCredential {
+    private static final ClientLogger LOGGER = new ClientLogger(SharedKeyCredential.class);
     private static final String AUTHORIZATION_HEADER_FORMAT = "SharedKey %s:%s";
 
     // Pieces of the connection string that are needed.
@@ -114,8 +116,10 @@ public String computeHmac256(final String stringToSign) {
             byte[] utf8Bytes = stringToSign.getBytes(StandardCharsets.UTF_8);
             return Base64.getEncoder().encodeToString(hmacSha256.doFinal(utf8Bytes));
         } catch (final NoSuchAlgorithmException e) {
+            LOGGER.asError().log(e.getMessage());
             throw new RuntimeException(e);
         } catch (InvalidKeyException e) {
+            LOGGER.asError().log("Please double check the account key. Error details: " + e.getMessage());
             throw new RuntimeException("Please double check the account key. Error details: " + e.getMessage());
         }
     }
@@ -228,6 +232,7 @@ private String computeHMACSHA256(String stringToSign) {
             String signature = Base64.getEncoder().encodeToString(hmacSha256.doFinal(utf8Bytes));
             return String.format(AUTHORIZATION_HEADER_FORMAT, accountName, signature);
         } catch (NoSuchAlgorithmException | InvalidKeyException ex) {
+            LOGGER.asError().log(ex.getMessage());
             throw new Error(ex);
         }
     }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java b/storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java
deleted file mode 100644
index f3513741d206d..0000000000000
--- a/storage/client/queue/src/main/java/com/azure/storage/common/policy/AnonymousCredentialPolicy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.storage.common.policy;
-
-import com.azure.core.http.HttpPipelineCallContext;
-import com.azure.core.http.HttpPipelineNextPolicy;
-import com.azure.core.http.HttpResponse;
-import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.storage.queue.QueueClient;
-import com.azure.storage.queue.QueueServiceClient;
-import reactor.core.publisher.Mono;
-
-/**
- * Anonymous credentials are to be used with with HTTP(S) requests that read blobs from public containers or requests
- * that use a Shared Access Signature (SAS). This is because Anonymous credentials will not set an Authorization header.
- * Pass an instance of this class as the credentials parameter when creating a new pipeline (typically with
- * {@link QueueServiceClient}, {@link QueueClient}).
- */
-public final class AnonymousCredentialPolicy implements HttpPipelinePolicy {
-
-    /**
-     * Returns an empty instance of {@code AnonymousCredentials}.
-     */
-    public AnonymousCredentialPolicy() {
-    }
-
-
-
-    @Override
-    public Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
-        return next.process();
-    }
-}
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
index a676e375e15ef..c511e0d978cc8 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -7,6 +7,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.http.rest.VoidResponse;
 import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.storage.common.credentials.SASTokenCredential;
 import com.azure.storage.common.credentials.SharedKeyCredential;
 import com.azure.storage.queue.implementation.AzureQueueStorageBuilder;
@@ -54,6 +55,7 @@
  * @see SASTokenCredential
  */
 public final class QueueAsyncClient {
+    private static final ClientLogger LOGGER = new ClientLogger(QueueAsyncClient.class);
     private final AzureQueueStorageImpl client;
     private final String queueName;
 
@@ -97,6 +99,7 @@ public URL getQueueUrl() {
         try {
             return new URL(client.url());
         } catch (MalformedURLException ex) {
+            LOGGER.asError().log("Queue URL is malformed");
             throw new RuntimeException("Queue URL is malformed");
         }
     }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
index d91e49c1156f1..d272cfc1bbf89 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -15,6 +15,7 @@
 import com.azure.core.implementation.util.ImplUtils;
 import com.azure.core.util.configuration.Configuration;
 import com.azure.core.util.configuration.ConfigurationManager;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.storage.common.credentials.SASTokenCredential;
 import com.azure.storage.common.credentials.SharedKeyCredential;
 import com.azure.storage.common.policy.SASTokenCredentialPolicy;
@@ -69,6 +70,7 @@
  * @see SharedKeyCredential
  */
 public final class QueueClientBuilder {
+    private static final ClientLogger LOGGER = new ClientLogger(QueueClientBuilder.class);
     private static final String ACCOUNT_NAME = "accountname";
     private final List policies;
 
@@ -133,6 +135,7 @@ public QueueAsyncClient buildAsyncClient() {
         Objects.requireNonNull(queueName);
 
         if (sasTokenCredential == null && sharedKeyCredential == null) {
+            LOGGER.asError().log("Credentials are required for authorization");
             throw new IllegalArgumentException("Credentials are required for authorization");
         }
 
@@ -199,7 +202,8 @@ public QueueClientBuilder endpoint(String endpoint) {
                 this.sasTokenCredential = credential;
             }
         } catch (MalformedURLException ex) {
-            throw new IllegalArgumentException("The Azure Storage Queue endpoint url is malformed.");
+            LOGGER.asError().log("The Azure Storage Queue endpoint url is malformed. Endpoint: " + endpoint);
+            throw new IllegalArgumentException("The Azure Storage Queue endpoint url is malformed. Endpoint: " + endpoint);
         }
 
         return this;
@@ -237,7 +241,7 @@ public QueueClientBuilder credential(SASTokenCredential credential) {
      * @throws NullPointerException If {@code credential} is {@code null}.
      */
     public QueueClientBuilder credential(SharedKeyCredential credential) {
-        this.sharedKeyCredential = credential;
+        this.sharedKeyCredential = Objects.requireNonNull(credential);
         return this;
     }
 
@@ -266,6 +270,8 @@ private void getEndPointFromConnectionString(String connectionString) {
         try {
             this.endpoint = new URL(String.format("https://%s.queue.core.windows.net", accountName));
         } catch (MalformedURLException e) {
+            LOGGER.asError().log("There is no valid account for the connection string. "
+                + "Connection String: %s", connectionString);
             throw new IllegalArgumentException(String.format("There is no valid account for the connection string. "
                                                                  + "Connection String: %s", connectionString));
         }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
index 809f2091a20c6..536b3f0abed48 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
@@ -7,6 +7,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.http.rest.VoidResponse;
 import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.storage.common.credentials.SASTokenCredential;
 import com.azure.storage.common.credentials.SharedKeyCredential;
 import com.azure.storage.queue.implementation.AzureQueueStorageBuilder;
@@ -51,6 +52,7 @@
  * @see SASTokenCredential
  */
 public final class QueueServiceAsyncClient {
+    private static final ClientLogger LOGGER = new ClientLogger(QueueServiceAsyncClient.class);
     private final AzureQueueStorageImpl client;
 
     /**
@@ -74,6 +76,7 @@ public URL getQueueServiceUrl() {
         try {
             return new URL(client.url());
         } catch (MalformedURLException ex) {
+            LOGGER.asError().log("Queue Service URL is malformed");
             throw new RuntimeException("Storage account URL is malformed");
         }
     }
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
index 680501f09f51b..63b191256f5dd 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClientBuilder.java
@@ -14,6 +14,7 @@
 import com.azure.core.implementation.http.policy.spi.HttpPolicyProviders;
 import com.azure.core.util.configuration.Configuration;
 import com.azure.core.util.configuration.ConfigurationManager;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.storage.common.credentials.SASTokenCredential;
 import com.azure.storage.common.credentials.SharedKeyCredential;
 import com.azure.storage.common.policy.SASTokenCredentialPolicy;
@@ -69,6 +70,7 @@
  * @see SharedKeyCredential
  */
 public final class QueueServiceClientBuilder {
+    private static final ClientLogger LOGGER = new ClientLogger(QueueServiceClientBuilder.class);
     private final List policies;
 
     private URL endpoint;
@@ -109,6 +111,7 @@ public QueueServiceAsyncClient buildAsyncClient() {
         Objects.requireNonNull(endpoint);
 
         if (sasTokenCredential == null && sharedKeyCredential == null) {
+            LOGGER.asError().log("Credentials are required for authorization");
             throw new IllegalArgumentException("Credentials are required for authorization");
         }
 
@@ -185,6 +188,7 @@ public QueueServiceClientBuilder endpoint(String endpoint) {
                 this.sasTokenCredential = credential;
             }
         } catch (MalformedURLException ex) {
+            LOGGER.asError().log("The Azure Storage Queue endpoint url is malformed.");
             throw new IllegalArgumentException("The Azure Storage Queue endpoint url is malformed.");
         }
 
@@ -199,7 +203,7 @@ public QueueServiceClientBuilder endpoint(String endpoint) {
      * @throws NullPointerException If {@code credential} is {@code null}.
      */
     public QueueServiceClientBuilder credential(SASTokenCredential credential) {
-        this.sasTokenCredential = credential;
+        this.sasTokenCredential = Objects.requireNonNull(credential);
         return this;
     }
 
@@ -211,7 +215,7 @@ public QueueServiceClientBuilder credential(SASTokenCredential credential) {
      * @throws NullPointerException If {@code credential} is {@code null}.
      */
     public QueueServiceClientBuilder credential(SharedKeyCredential credential) {
-        this.sharedKeyCredential = credential;
+        this.sharedKeyCredential = Objects.requireNonNull(credential);
         return this;
     }
 
diff --git a/storage/client/queue/package-info.java b/storage/client/queue/src/main/java/com/azure/storage/queue/package-info.java
similarity index 100%
rename from storage/client/queue/package-info.java
rename to storage/client/queue/src/main/java/com/azure/storage/queue/package-info.java

From 73f0b8984a32cd96dbfc4018f267f7b6205e704c Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Thu, 18 Jul 2019 16:49:47 -0700
Subject: [PATCH 14/16] Make changes to queue configuration

---
 pom.client.xml                                              | 6 +++++-
 .../main/java/com/azure/storage/queue/QueueAsyncClient.java | 4 ++--
 .../java/com/azure/storage/queue/QueueConfiguration.java    | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pom.client.xml b/pom.client.xml
index d4f2f08341ff4..e833ab1290e4e 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -393,6 +393,10 @@
                 Azure Storage - Blobs
                 com.azure.storage.blob*
               
+              
+                Azure Storage - Queues
+                com.azure.storage.queue*
+              
             
             
               https://docs.oracle.com/javase/8/docs/api/
@@ -546,7 +550,7 @@
                 -snippetpath ${project.basedir}/sdk/eventhubs/azure-eventhubs/src/samples/java
                 -snippetpath ${project.basedir}/sdk/keyvault/azure-keyvault-keys/src/samples/java
                 -snippetpath ${project.basedir}/sdk/keyvault/azure-keyvault-secrets/src/samples/java
-                
+                
                 -snippetpath ${project.basedir}/storage/client/queue/src/samples/java
               
             
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
index c511e0d978cc8..f523497480a1a 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -60,8 +60,8 @@ public final class QueueAsyncClient {
     private final String queueName;
 
     /**
-     * Creates a QueueAsyncClient that sends requests to the storage queue service at {@link AzureQueueStorageImpl#url() endpoint}.
-     * Each service call goes through the {@link HttpPipeline pipeline} in the {@code client}.
+     * Creates a QueueAsyncClient that sends requests to the storage queue service at {@code AzureQueueStorageImpl#url() endpoint}.
+     * Each service call goes through the {@link HttpPipeline pipeline} in the {@code AzureQueueStorageImpl client}.
      *
      * @param client Client that interacts with the service interfaces
      * @param queueName Name of the queue
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java
index 1de39c548c262..7a794525484f7 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueConfiguration.java
@@ -7,6 +7,6 @@
  */
 class QueueConfiguration {
     //TODO: Eventually remove these hardcoded strings with https://github.com/Azure/azure-sdk-for-java/issues/3141
-    static final String NAME = "storage-queue";
-    static final String VERSION = "1.0.0-SNAPSHOT";
+    static final String NAME = "azure-storage-queue";
+    static final String VERSION = "12.0.0-preview.1";
 }

From 5b540c6c1de645efbdd8e9fe503cd4ac0edb943e Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Fri, 19 Jul 2019 17:14:52 -0700
Subject: [PATCH 15/16] Minor changes for queue java doc and readme code
 snippet.

---
 storage/client/queue/README.md                | 17 ++++++-------
 .../azure/storage/queue/QueueAsyncClient.java | 13 ++--------
 .../com/azure/storage/queue/QueueClient.java  |  8 +------
 .../queue/QueueServiceAsyncClient.java        |  9 ++-----
 .../storage/queue/QueueServiceClient.java     |  7 +-----
 .../javadoc/QueueJavaDocCodeSamples.java      | 24 +++++++++++++++++++
 .../QueueServiceJavaDocCodeSamples.java       | 23 ++++++++++++++++++
 7 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/storage/client/queue/README.md b/storage/client/queue/README.md
index 07180efd5d775..436f7e6f2094a 100644
--- a/storage/client/queue/README.md
+++ b/storage/client/queue/README.md
@@ -109,10 +109,10 @@ The queue service do operations on the queues in the storage account and manage
 ### Queue Service Client
 
 The client performs the interactions with the Queue service, create or delete a queue, getting and setting Queue properties, list queues in account, and get queue statistics. An asynchronous, `QueueServiceAsyncClient`, and synchronous, `QueueClient`, client exists in the SDK allowing for selection of a client based on an application's use case.
-Once you have the value of the SASToken you can create the queue service client with `${accountName}`, `${sasToken}`.
+Once you have the value of the SASToken you can create the queue service client with `${accountName}`, `${SASToken}`.
 ```Java
-String queueServiceURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceClient queueServiceClient = QueueServiceClient.builder().endpoint(queueURL).build();
+String queueServiceURL = String.format("https://%s.queue.core.windows.net", accountName)
+QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(queueURL).credential(SASToken).build();
 
 QueueClient newQueueServiceClient = queueServiceClient.createQueue("myqueue");
 ```
@@ -120,8 +120,9 @@ QueueClient newQueueServiceClient = queueServiceClient.createQueue("myqueue");
 or
 
 ```Java
-String queueServiceAsyncURL = String.format("https://%s.queue.core.windows.net/%s", accountName, sasToken)
-QueueServiceAsyncClient queueServiceAsyncClient = QueueServiceAsyncClient.builder().endpoint(queueServiceAsyncURL).build();
+String queueServiceAsyncURL = String.format("https://%s.queue.core.windows.net/", accountName)
+QueueServiceAsyncClient queueServiceAsyncClient = new QueueServiceClientBuilder().endpoint(queueServiceAsyncURL)
+                                                        credential(SASToken).build();
 queueServiceAsyncClient.createQueue("newAsyncQueue").subscribe(
     result -> {
       // do something when new queue created
@@ -139,10 +140,10 @@ Azure Queue storage is a service for storing large numbers of messages that can
 A single queue message can be up to 64 KB in size, and a queue can contain millions of messages, up to the total capacity limit of a storage account.
 
 ### QueueClient
-Once you have the value of the SASToken you can create the queue service client with `${accountName}`, `${queueName}`, `${sasToken}`.
+Once you have the value of the SASToken you can create the queue service client with `${accountName}`, `${queueName}`, `${SASToken}`.
 ```Java
-String queueURL = String.format("https://%s.queue.core.windows.net/%s%s", accountName, queueName, sasToken);
-QueueClient queueClient = QueueClient.builder().endpoint(queueURL).build();
+String queueURL = String.format("https://%s.queue.core.windows.net/%s", accountName, queueName);
+QueueClient queueClient = QueueClient.builder().endpoint(queueURL).credential(SASToken).build();
 // metadata is map of key-value pair, timeout is client side timeout
 QueueClient newQueueClient = queueClient.create(metadata, timeout);
 ```
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
index f523497480a1a..2d3bd7636aeaf 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -39,13 +39,7 @@
  *
  * 
    Instantiating an Asynchronous Queue Client
    
  *
- * 
    - * QueueAsyncClient client = QueueAsyncClient.builder()
- *     .connectionString(connectionString)
- *     .endpoint(endpoint)
- *     .queueName(queueName)
- *     .buildAsyncClient();
- * 
    
+ * {@codesnippet com.azure.storage.queue.queueAsyncClient.instantiation}
  *
  * 
    View {@link QueueClientBuilder this} for additional ways to construct the client.
    
  *
@@ -397,10 +391,7 @@ public Flux peekMessages() {
      *
      * 
    Peek up to the first five messages
    
      *
-     * 
    -     * client.peekMessages(5)
-     *     .subscribe(result -> System.out.printf("Peeked message %s has been dequeued %d times", result.messageId(), result.dequeueCount()));
-     * 
    
+     * {@codesnippet com.azure.storage.queue.queueAsyncClient.peekMessages#integer}
      *
      * @param maxMessages Optional. Maximum number of messages to peek, if there are less messages exist in the queue than requested
      * all the messages will be peeked. If left empty only 1 message will be peeked, the allowed range is 1 to 32
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
index ead22e309d9d0..763c58560871e 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueClient.java
@@ -25,13 +25,7 @@
  *
  * 
    Instantiating an Synchronous Queue Client
    
  *
- * 
    - * QueueClient client = QueueClient.builder()
- *     .connectionString(connectionString)
- *     .endpoint(endpoint)
- *     .queueName(queueName)
- *     .buildClient();
- * 
    
+ * {@codesnippet com.azure.storage.queue.queueClient.instantiation}
  *
  * 
    View {@link QueueClientBuilder this} for additional ways to construct the client.
    
  *
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
index 536b3f0abed48..f2d8e636c6cc2 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
@@ -37,12 +37,7 @@
  *
  * 
    Instantiating an Asynchronous Queue Service Client
    
  *
- * 
    - * QueueServiceAsyncClient client = QueueServiceAsyncClient.builder()
- *     .connectionString(connectionString)
- *     .endpoint(endpoint)
- *     .buildAsyncClient();
- * 
    
+ * {@codesnippet com.azure.storage.queue.queueServiceAsyncClient.instantiation}
  *
  * 
    View {@link QueueServiceClientBuilder this} for additional ways to construct the client.
    
  *
@@ -227,7 +222,7 @@ private Flux listQueues(ServicesListQueuesSegmentResponse response, L
     /*
      * Helper function used to auto-enumerate though paged responses
      */
-    private Publisher extractAndFetchQueues(ServicesListQueuesSegmentResponse response, List include, Context context) {
+    private Flux extractAndFetchQueues(ServicesListQueuesSegmentResponse response, List include, Context context) {
         String nextPageLink = response.value().nextMarker();
         if (nextPageLink == null) {
             return Flux.fromIterable(response.value().queueItems());
diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
index 3fbe9521bcfca..a002e5b12f872 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceClient.java
@@ -23,12 +23,7 @@
  *
  * 
    Instantiating an Synchronous Queue Service Client
    
  *
- * 
    - * QueueServiceClient client = QueueServiceClient.builder()
- *     .connectionString(connectionString)
- *     .endpoint(endpoint)
- *     .buildClient();
- * 
    
+ * {@codesnippet com.azure.storage.queue.queueServiceClient.instantiation}
  *
  * 
    View {@link QueueServiceClientBuilder this} for additional ways to construct the client.
    
  *
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
index 711572eff5b8c..24b0405a49350 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueJavaDocCodeSamples.java
@@ -27,6 +27,30 @@
  */
 
 public class QueueJavaDocCodeSamples {
+    /**
+     * Generates code sample for creating a {@link QueueClient}.
+     */
+    public void buildQueueClient() {
+        // BEGIN: com.azure.storage.queue.queueClient.instantiation
+        QueueClient client = new QueueClientBuilder()
+            .connectionString("connectionstring")
+            .endpoint("endpoint")
+            .buildClient();
+        // END: com.azure.storage.queue.queueClient.instantiation
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueAsyncClient}.
+     */
+    public void buildQueueAsyncClient() {
+        // BEGIN: com.azure.storage.queue.queueAsyncClient.instantiation
+        QueueAsyncClient client = new QueueClientBuilder()
+            .connectionString("connectionstring")
+            .endpoint("endpoint")
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueAsyncClient.instantiation
+    }
+
     /**
      * Generates code sample for creating a {@link QueueClient} with {@link QueueClient}
      * @return An instance of {@link QueueClient}
diff --git a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
index b81802e2cbf3e..3ed03621fbf76 100644
--- a/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
+++ b/storage/client/queue/src/samples/java/com/azure/storage/queue/javadoc/QueueServiceJavaDocCodeSamples.java
@@ -20,6 +20,29 @@
  * Contains code snippets when generating javadocs through doclets for {@link QueueServiceClient} and {@link QueueServiceAsyncClient}.
  */
 public class QueueServiceJavaDocCodeSamples {
+    /**
+     * Generates code sample for creating a {@link QueueServiceClient}.
+     */
+    public void buildQueueServiceClient() {
+        // BEGIN: com.azure.storage.queue.queueServiceClient.instantiation
+        QueueServiceClient client = new QueueServiceClientBuilder()
+            .connectionString("connectionstring")
+            .endpoint("endpoint")
+            .buildClient();
+        // END: com.azure.storage.queue.queueServiceClient.instantiation
+    }
+
+    /**
+     * Generates code sample for creating a {@link QueueServiceAsyncClient}.
+     */
+    public void buildQueueServiceAsyncClient() {
+        // BEGIN: com.azure.storage.queue.queueServiceAsyncClient.instantiation
+        QueueServiceAsyncClient client = new QueueServiceClientBuilder()
+            .connectionString("connectionstring")
+            .endpoint("endpoint")
+            .buildAsyncClient();
+        // END: com.azure.storage.queue.queueServiceAsyncClient.instantiation
+    }
 
     /**
      * Generates code sample for creating a {@link QueueServiceClient} with {@link SASTokenCredential}

From c440e58afac5e5adaa2369c759d0fcb81844279e Mon Sep 17 00:00:00 2001
From: Sima Zhu 
Date: Fri, 19 Jul 2019 17:43:28 -0700
Subject: [PATCH 16/16] fix checkstyle

---
 .../java/com/azure/storage/queue/QueueServiceAsyncClient.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
index f2d8e636c6cc2..e093f1d34b171 100644
--- a/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
+++ b/storage/client/queue/src/main/java/com/azure/storage/queue/QueueServiceAsyncClient.java
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;