Merge pull request Azure#14 from alzimmermsft/AzStorage_Blobs_Verify_…

…Tests

Moved Models into Model Package and Removed Unused/Duplicate Classes

storage/client/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java

@@ -6,8 +6,12 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.storage.blob.implementation.AzureBlobStorageBuilder;
+import com.azure.storage.blob.models.AppendBlobAccessConditions;
 import com.azure.storage.blob.models.AppendBlobItem;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;

storage/client/src/main/java/com/azure/storage/blob/AppendBlobAsyncRawClient.java

@@ -5,10 +5,14 @@
 
 import com.azure.core.util.Context;
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
+import com.azure.storage.blob.models.AppendBlobAccessConditions;
 import com.azure.storage.blob.models.AppendBlobsAppendBlockFromUrlResponse;
 import com.azure.storage.blob.models.AppendBlobsAppendBlockResponse;
 import com.azure.storage.blob.models.AppendBlobsCreateResponse;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;

storage/client/src/main/java/com/azure/storage/blob/AppendBlobClient.java

@@ -4,8 +4,12 @@
 package com.azure.storage.blob;
 
 import com.azure.core.http.rest.Response;
+import com.azure.storage.blob.models.AppendBlobAccessConditions;
 import com.azure.storage.blob.models.AppendBlobItem;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;

storage/client/src/main/java/com/azure/storage/blob/AppendBlobRawClient.java

@@ -4,10 +4,14 @@
 package com.azure.storage.blob;
 
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
+import com.azure.storage.blob.models.AppendBlobAccessConditions;
 import com.azure.storage.blob.models.AppendBlobsAppendBlockFromUrlResponse;
 import com.azure.storage.blob.models.AppendBlobsAppendBlockResponse;
 import com.azure.storage.blob.models.AppendBlobsCreateResponse;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;

storage/client/src/main/java/com/azure/storage/blob/BlobAsyncClient.java

@@ -10,11 +10,16 @@
 import com.azure.core.implementation.util.FluxUtil;
 import com.azure.storage.blob.implementation.AzureBlobStorageBuilder;
 import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlobStartCopyFromURLHeaders;
 import com.azure.storage.blob.models.DeleteSnapshotsOptionType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
+import com.azure.storage.blob.models.ReliableDownloadOptions;
+import com.azure.storage.blob.models.StorageAccountInfo;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

storage/client/src/main/java/com/azure/storage/blob/BlobClient.java

@@ -6,11 +6,16 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.VoidResponse;
 import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlobStartCopyFromURLHeaders;
 import com.azure.storage.blob.models.DeleteSnapshotsOptionType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
+import com.azure.storage.blob.models.ReliableDownloadOptions;
+import com.azure.storage.blob.models.StorageAccountInfo;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
@@ -310,7 +315,7 @@ public VoidResponse download(OutputStream stream) throws IOException {
      *         An optional timeout value beyond which a {@link RuntimeException} will be raised.
      */
     public VoidResponse download(OutputStream stream, ReliableDownloadOptions options, BlobRange range,
-            BlobAccessConditions accessConditions, boolean rangeGetContentMD5, Duration timeout) throws IOException {
+                                 BlobAccessConditions accessConditions, boolean rangeGetContentMD5, Duration timeout) throws IOException {
         Mono<VoidResponse> download = blobAsyncClient
             .download(range, accessConditions, rangeGetContentMD5, options)
             .flatMapMany(res -> res.value()

storage/client/src/main/java/com/azure/storage/blob/BlobInputStream.java

@@ -2,6 +2,8 @@
 // Licensed under the MIT License.
 package com.azure.storage.blob;
 
+import com.azure.storage.blob.models.BlobAccessConditions;
+import com.azure.storage.blob.models.BlobRange;
 import reactor.netty.ByteBufFlux;
 
 import java.io.ByteArrayInputStream;

storage/client/src/main/java/com/azure/storage/blob/BlobOutputStream.java

@@ -2,9 +2,12 @@
 // Licensed under the MIT License.
 package com.azure.storage.blob;
 
+import com.azure.storage.blob.models.AppendBlobAccessConditions;
 import com.azure.storage.blob.models.AppendPositionAccessConditions;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.PageBlobAccessConditions;
 import com.azure.storage.blob.models.PageRange;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;

storage/client/src/main/java/com/azure/storage/blob/BlobProperties.java

@@ -2,6 +2,7 @@
 
 import com.azure.storage.blob.models.BlobGetPropertiesHeaders;
 import com.azure.storage.blob.models.BlobType;
+import com.azure.storage.blob.models.Metadata;
 
 public class BlobProperties {
 

storage/client/src/main/java/com/azure/storage/blob/BlobRawClient.java

@@ -5,7 +5,9 @@
 
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
 import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlobStartCopyFromURLHeaders;
 import com.azure.storage.blob.models.BlobsAbortCopyFromURLResponse;
 import com.azure.storage.blob.models.BlobsAcquireLeaseResponse;
@@ -25,7 +27,9 @@
 import com.azure.storage.blob.models.BlobsUndeleteResponse;
 import com.azure.storage.blob.models.DeleteSnapshotsOptionType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
+import com.azure.storage.blob.models.ReliableDownloadOptions;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;

storage/client/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java

@@ -8,11 +8,14 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.implementation.util.FluxUtil;
 import com.azure.storage.blob.implementation.AzureBlobStorageBuilder;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlockBlobItem;
 import com.azure.storage.blob.models.BlockItem;
 import com.azure.storage.blob.models.BlockListType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

storage/client/src/main/java/com/azure/storage/blob/BlockBlobAsyncRawClient.java

@@ -5,7 +5,9 @@
 
 import com.azure.core.util.Context;
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlockBlobsCommitBlockListResponse;
 import com.azure.storage.blob.models.BlockBlobsGetBlockListResponse;
 import com.azure.storage.blob.models.BlockBlobsStageBlockFromURLResponse;
@@ -14,6 +16,7 @@
 import com.azure.storage.blob.models.BlockListType;
 import com.azure.storage.blob.models.BlockLookupList;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;

storage/client/src/main/java/com/azure/storage/blob/BlockBlobClient.java

@@ -5,11 +5,14 @@
 
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.SimpleResponse;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlockBlobItem;
 import com.azure.storage.blob.models.BlockItem;
 import com.azure.storage.blob.models.BlockListType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;

storage/client/src/main/java/com/azure/storage/blob/BlockBlobRawClient.java

@@ -4,14 +4,17 @@
 package com.azure.storage.blob;
 
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
+import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlockBlobsCommitBlockListResponse;
 import com.azure.storage.blob.models.BlockBlobsGetBlockListResponse;
 import com.azure.storage.blob.models.BlockBlobsStageBlockFromURLResponse;
 import com.azure.storage.blob.models.BlockBlobsStageBlockResponse;
 import com.azure.storage.blob.models.BlockBlobsUploadResponse;
 import com.azure.storage.blob.models.BlockListType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import io.netty.buffer.ByteBuf;
 import reactor.core.publisher.Flux;

storage/client/src/main/java/com/azure/storage/blob/Constants.java

@@ -76,11 +76,6 @@ static final class HeaderConstants {
          */
         static final String AUTHORIZATION = "Authorization";
 
-        /**
-         * The format string for specifying ranges with only begin offset.
-         */
-        static final String BEGIN_RANGE_HEADER_FORMAT = "bytes=%d-";
-
         /**
          * The header that indicates the client request ID.
          */
@@ -146,11 +141,6 @@ static final class HeaderConstants {
          */
         static final String RANGE = "Range";
 
-        /**
-         * The format string for specifying ranges.
-         */
-        static final String RANGE_HEADER_FORMAT = "bytes=%d-%d";
-
         /**
          * The copy source header.
          */

storage/client/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java

@@ -13,12 +13,16 @@
 import com.azure.storage.blob.models.BlobHierarchyListSegment;
 import com.azure.storage.blob.models.BlobItem;
 import com.azure.storage.blob.models.BlobPrefix;
+import com.azure.storage.blob.models.ContainerAccessConditions;
 import com.azure.storage.blob.models.ContainersListBlobFlatSegmentResponse;
 import com.azure.storage.blob.models.ContainersListBlobHierarchySegmentResponse;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.ListBlobsOptions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
 import com.azure.storage.blob.models.PublicAccessType;
 import com.azure.storage.blob.models.SignedIdentifier;
+import com.azure.storage.blob.models.StorageAccountInfo;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 

storage/client/src/main/java/com/azure/storage/blob/ContainerAsyncRawClient.java

@@ -5,6 +5,7 @@
 
 import com.azure.core.util.Context;
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
+import com.azure.storage.blob.models.ContainerAccessConditions;
 import com.azure.storage.blob.models.ContainersAcquireLeaseResponse;
 import com.azure.storage.blob.models.ContainersBreakLeaseResponse;
 import com.azure.storage.blob.models.ContainersChangeLeaseResponse;
@@ -20,6 +21,8 @@
 import com.azure.storage.blob.models.ContainersSetAccessPolicyResponse;
 import com.azure.storage.blob.models.ContainersSetMetadataResponse;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.ListBlobsOptions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
 import com.azure.storage.blob.models.PublicAccessType;
 import com.azure.storage.blob.models.SignedIdentifier;

storage/client/src/main/java/com/azure/storage/blob/ContainerClient.java

@@ -7,10 +7,14 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.VoidResponse;
 import com.azure.storage.blob.models.BlobItem;
+import com.azure.storage.blob.models.ContainerAccessConditions;
 import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.ListBlobsOptions;
+import com.azure.storage.blob.models.Metadata;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
 import com.azure.storage.blob.models.PublicAccessType;
 import com.azure.storage.blob.models.SignedIdentifier;
+import com.azure.storage.blob.models.StorageAccountInfo;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;