Merge pull request #51 from emgerner-msft/master

Java Storage Client Library 3.1.0

Author: emgerner-msft

ChangeLog.txt

@@ -1,3 +1,11 @@
+2015.09.16 Version 3.1.0
+ * Fixed a bug in table where a select on a non-existent field resulted in a null reference exception if the corresponding field in the TableEntity was not nullable.
+ * Fixed a bug in table where JsonParser was automatically closing the response stream before it was completely drained causing socket exhaustion.
+ * Fixed a bug in StorageCredentialsAccountAndKey.updateKey(String) which prevented valid keys from being set.
+ * Added CloudBlobContainer.listBlobs(final String, final boolean) method.
+ * Fixed a bug in blob where using AccessConditions on block blob uploads larger than 64MB done with the upload* methods or block blob uploads done openOutputStream with would fail if the blob did not already exist.
+ * Added support for setting a proxy per request. Proxy can be set on an OperationContext instance and will be used when that instance is passed to the request method.
+
 2015.08.04 Version 3.0.0
  * Added support for SAS to the Azure File service.
  * Added support for Append Blob.

README.md

@@ -30,7 +30,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>3.0.0</version>
+	<version>3.1.0</version>
 </dependency>
 ```
 

microsoft-azure-storage-samples/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>3.0.0</version>
+			<version>3.1.0</version>
 		</dependency>
 	</dependencies>
 </project>

microsoft-azure-storage-test/src/com/microsoft/azure/storage/StorageAccountTests.java

@@ -75,6 +75,24 @@ public void testStorageCredentialsSharedKey() throws URISyntaxException, Storage
         cred = new StorageCredentialsAccountAndKey(ACCOUNT_NAME, base64EncodedDummyKey);
         assertEquals(base64EncodedDummyKey, cred.exportBase64EncodedKey());
     }
+    
+    @Test
+    public void testStorageCredentialsSharedKeyUpdateKey() throws URISyntaxException, StorageException {
+        StorageCredentialsAccountAndKey cred = new StorageCredentialsAccountAndKey(ACCOUNT_NAME, ACCOUNT_KEY);
+        assertEquals(ACCOUNT_KEY, cred.exportBase64EncodedKey());
+        
+        // Validate update with byte array
+        byte[] dummyKey = { 0, 1, 2 };
+        cred.updateKey(dummyKey);
+        String base64EncodedDummyKey = Base64.encode(dummyKey);
+        assertEquals(base64EncodedDummyKey, cred.exportBase64EncodedKey());
+
+        // Validate update with string
+        dummyKey[0] = 3;
+        base64EncodedDummyKey = Base64.encode(dummyKey);
+        cred.updateKey(base64EncodedDummyKey);
+        assertEquals(base64EncodedDummyKey, cred.exportBase64EncodedKey());
+    }
 
     @Test
     public void testStorageCredentialsSAS() throws URISyntaxException, StorageException {

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/BlobOutputStreamTests.java

@@ -21,6 +21,7 @@
 import java.net.HttpURLConnection;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
@@ -32,6 +33,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import com.microsoft.azure.storage.AccessCondition;
 import com.microsoft.azure.storage.Constants;
 import com.microsoft.azure.storage.OperationContext;
 import com.microsoft.azure.storage.ResponseReceivedEvent;
@@ -100,6 +102,36 @@ public void testClose() throws URISyntaxException, StorageException, IOException
         assertEquals(1, blocks.size());
     }
 
+    @Test
+    public void testWithAccessCondition() throws URISyntaxException, StorageException, IOException {
+        int blobLengthToUse = 8 * 512;
+        byte[] buffer = BlobTestHelper.getRandomBuffer(blobLengthToUse);
+        String blobName = BlobTestHelper.generateRandomBlobNameWithPrefix("testblob");
+        AccessCondition accessCondition = AccessCondition.generateIfNotModifiedSinceCondition(new Date()); 
+        
+        CloudBlockBlob blockBlob = this.container.getBlockBlobReference(blobName);
+        BlobOutputStream blobOutputStream = blockBlob.openOutputStream(accessCondition, null, null);
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(buffer);
+        blobOutputStream.write(inputStream, 512);
+
+        inputStream = new ByteArrayInputStream(buffer, 512, 3 * 512);
+        blobOutputStream.write(inputStream, 3 * 512);
+
+        blobOutputStream.close();
+
+        byte[] result = new byte[blobLengthToUse];
+        blockBlob.downloadToByteArray(result, 0);
+
+        int i = 0;
+        for (; i < 4 * 512; i++) {
+            assertEquals(buffer[i], result[i]);
+        }
+
+        for (; i < 8 * 512; i++) {
+            assertEquals(0, result[i]);
+        }
+    }
+    
     @Test
     public void testWriteStream() throws URISyntaxException, StorageException, IOException {
         int blobLengthToUse = 8 * 512;

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobContainerTests.java

@@ -449,6 +449,46 @@ public void testCloudBlobContainerListBlobs() throws StorageException, IOExcepti
         assertTrue(blobNames.size() == 0);
     }
 
+    /**
+     * List the blobs in a container with a prefix
+     * 
+     * @throws URISyntaxException
+     * @throws StorageException
+     * @throws IOException
+     */
+    @Test
+    @Category({ DevFabricTests.class, DevStoreTests.class })
+    public void testCloudBlobContainerListBlobsPrefix() throws StorageException, IOException, URISyntaxException {
+        this.container.create();
+        int numBlobs = 2;
+        List<String> blobNames = BlobTestHelper
+                .uploadNewBlobs(this.container, BlobType.BLOCK_BLOB, numBlobs, 128, null);
+
+        BlobTestHelper.uploadNewBlob(this.container, BlobType.BLOCK_BLOB, "pref/blob1", 128, null);
+        blobNames.add("pref/blob1");
+        
+        BlobTestHelper.uploadNewBlob(this.container, BlobType.BLOCK_BLOB, "pref/blob2", 128, null);
+        blobNames.add("pref/blob2");
+
+        // Flat listing false
+        int count = 0;
+        for (ListBlobItem blob : this.container.listBlobs("pref")) {
+            assertEquals(CloudBlobDirectory.class, blob.getClass());
+            assertTrue(((CloudBlobDirectory)blob).getPrefix().startsWith("pref"));
+            count++;
+        }
+        assertEquals(1, count);
+        
+        // Flat listing true
+        count = 0;
+        for (ListBlobItem blob : this.container.listBlobs("pref", true)) {
+            assertEquals(CloudBlockBlob.class, blob.getClass());
+            assertTrue(((CloudBlockBlob)blob).getName().startsWith("pref/blob"));
+            count++;
+        }
+        assertEquals(2, count);
+    }
+    
     /**
      * List the blobs in a container with next(). This tests for the item in the changelog: "Fixed a bug for all 
      * listing API's where next() would sometimes throw an exception if hasNext() had not been called even if 

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlockBlobTests.java

@@ -899,6 +899,27 @@ public void testBlobUploadFromStreamTest() throws URISyntaxException, StorageExc
         blockBlobRef.download(dstStream);
         BlobTestHelper.assertStreamsAreEqual(srcStream, new ByteArrayInputStream(dstStream.toByteArray()));
     }
+    
+    @Test
+    public void testBlobUploadFromStreamAccessConditionTest() throws URISyntaxException, StorageException, IOException {        
+        final String blockBlobName = BlobTestHelper.generateRandomBlobNameWithPrefix("testBlockBlob");
+        final CloudBlockBlob blockBlobRef = this.container.getBlockBlobReference(blockBlobName);
+        AccessCondition accessCondition = AccessCondition.generateIfNotModifiedSinceCondition(new Date()); 
+        
+        int length = 2 * 1024;
+        ByteArrayInputStream srcStream = BlobTestHelper.getRandomDataStream(length);
+        blockBlobRef.upload(srcStream, -1, accessCondition, null, null);
+        ByteArrayOutputStream dstStream = new ByteArrayOutputStream();
+        blockBlobRef.download(dstStream);
+        BlobTestHelper.assertStreamsAreEqual(srcStream, new ByteArrayInputStream(dstStream.toByteArray()));
+
+        length = 5 * 1024 * 1024;
+        srcStream = BlobTestHelper.getRandomDataStream(length);
+        blockBlobRef.upload(srcStream, length);
+        dstStream = new ByteArrayOutputStream();
+        blockBlobRef.download(dstStream);
+        BlobTestHelper.assertStreamsAreEqual(srcStream, new ByteArrayInputStream(dstStream.toByteArray()));
+    }
 
     @Test
     @Category({ DevFabricTests.class, DevStoreTests.class })

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileTests.java

@@ -1488,8 +1488,7 @@ private void doCloudFileCopy(boolean sourceIsSas, boolean destinationIsSas)
 
             // Get destination file reference
             StorageCredentialsSharedAccessSignature credentials = new StorageCredentialsSharedAccessSignature(sasToken);
-            copyDestination = new CloudFile(destination.getUri(),
-                    destination.getServiceClient().getCredentials());
+            copyDestination = new CloudFile(destination.getUri(), credentials);
         }
 
         // Start copy and wait for completion

microsoft-azure-storage-test/src/com/microsoft/azure/storage/table/TableQueryTests.java

@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 
 import org.junit.AfterClass;
@@ -133,6 +134,70 @@ private void testTableWithSelectOnMissingFields(TableRequestOptions options) thr
         assertEquals(EdmType.STRING, ent.getProperties().get("F").getEdmType());
     }
 
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testTableQueryProjectionWithNull() throws URISyntaxException, StorageException {
+        CloudTable table = TableTestHelper.getRandomTableReference();
+        try {
+            // Create a new table so we don't pollute the main query table
+            table.createIfNotExists();
+
+            // Insert an entity which is missing String and IntegerPrimitive
+            DynamicTableEntity entity = new DynamicTableEntity(UUID.randomUUID().toString(), UUID.randomUUID()
+                    .toString());
+            table.execute(TableOperation.insert(entity));
+
+            testTableQueryProjectionWithSpecialCases(table, TablePayloadFormat.Json);
+            testTableQueryProjectionWithSpecialCases(table, TablePayloadFormat.AtomPub);
+        }
+        finally {
+            table.deleteIfExists();
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testTableQueryProjectionWithIncorrectTypes() throws URISyntaxException, StorageException {
+        CloudTable table = TableTestHelper.getRandomTableReference();
+        try {
+            // Create a new table so we don't pollute the main query table
+            table.createIfNotExists();
+
+            // Insert an entity with String as an int, and IntegerPrimitive as a bool
+            DynamicTableEntity entity = new DynamicTableEntity(UUID.randomUUID().toString(), UUID.randomUUID()
+                    .toString());
+            entity.getProperties().put("String", new EntityProperty(1234));
+            entity.getProperties().put("IntegerPrimitive", new EntityProperty(true));
+            table.execute(TableOperation.insert(entity));
+
+            testTableQueryProjectionWithSpecialCases(table, TablePayloadFormat.Json);
+            testTableQueryProjectionWithSpecialCases(table, TablePayloadFormat.AtomPub);
+        }
+        finally {
+            table.deleteIfExists();
+        }
+    }
+
+    private void testTableQueryProjectionWithSpecialCases(CloudTable table, TablePayloadFormat format) {
+        table.getServiceClient().getDefaultRequestOptions().setTablePayloadFormat(format);
+
+        // Query on String and IntegerPrimitive
+        TableQuery<ComplexEntity> query = TableQuery.from(ComplexEntity.class).select(
+                new String[] { "String", "IntegerPrimitive"});
+        Iterable<ComplexEntity> iterable = table.execute(query);
+
+        List<ComplexEntity> entities = new ArrayList<ComplexEntity>();
+        for (ComplexEntity entity : iterable) {
+            entities.add(entity);
+        }
+
+        // Verify A has a set value and B and E have class defaults
+        assertEquals(1, entities.size());
+        ComplexEntity entity = entities.get(0);
+        assertNull(entity.getString());
+        assertEquals(-1, entity.getIntegerPrimitive());
+    }
+
     @Test
     public void testTableQueryWithSpecialChars() throws StorageException, URISyntaxException {
         CloudTable table = TableTestHelper.getRandomTableReference();

microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java

@@ -550,7 +550,7 @@ public static class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        public static final String USER_AGENT_VERSION = "3.0.0";
+        public static final String USER_AGENT_VERSION = "3.1.0";
 
         /**
          * The default type for content-type and accept