Merge pull request #40 from emgerner-msft/master

Java Storage Client Library 2.1.0

Author: pemari-msft

ChangeLog.txt

@@ -1,3 +1,15 @@
+2015.04.01 Version 2.1.0
+ * Fixed a bug for all listing API's where next() would sometimes throw an exception if hasNext() had not been called even if there were more elements to iterate on.
+ * Added sequence number to the blob properties. This is populated for page blobs.
+ * Creating a page blob sets its length property.
+ * Added support for page blob sequence numbers and sequence number access conditions. 
+ * Fixed a bug in abort copy where the lease access condition was not sent to the service.
+ * Fixed an issue in startCopyFromBlob where if the URI of the source blob contained certain non-ASCII characters they would not be encoded appropriately. This would result in Authorization failures.
+ * Fixed a small performance issue in XML serialization.
+ * Fixed a bug in BlobOutputStream and FileOutputStream where flush added data to a request pool rather than immediately committing it to the Azure service.
+ * Refactored to remove the blob, queue, and file package dependency on table in the error handling code.
+ * Added additional client-side logging for REST requests, responses, and errors.
+
 2014.12.20 Version 2.0.0
  * Deprecated getSubDirectoryReference() for blob directories and file directories. Use getDirectoryReference() instead. 
  * Fixed a bug where maxResults was not verified to be positive for list operations.

README.md

@@ -28,7 +28,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>2.0.0</version>
+	<version>2.1.0</version>
 </dependency>
 ```
 
@@ -130,4 +130,4 @@ If you encounter any bugs with the library please file an issue in the [Issues](
 * [Azure Developer Center](http://azure.microsoft.com/en-us/develop/java/)
 * [Azure Storage Service](http://azure.microsoft.com/en-us/documentation/services/storage/)
 * [Azure Storage Team Blog](http://blogs.msdn.com/b/windowsazurestorage/)
-* [JavaDocs](http://dl.windowsazure.com/storage/javadoc)
+* [JavaDocs](http://dl.windowsazure.com/storage/javadoc)

microsoft-azure-storage-samples/pom.xml

@@ -25,7 +25,7 @@
   <dependency>  
      <groupId>com.microsoft.azure</groupId>
      <artifactId>azure-storage</artifactId>
-     <version>2.0.0</version>
-</dependency>
+     <version>2.1.0</version>
+  </dependency>
 </dependencies>
 </project>

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/blob/gettingstarted/BlobBasics.java

@@ -16,6 +16,7 @@
 
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
+import java.util.UUID;
 
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.blob.BlobContainerPermissions;
@@ -53,7 +54,10 @@ public static void main(String[] args) throws InvalidKeyException, URISyntaxExce
 		try {
 			// Get a reference to a container
 			// The container name must be lower case
-			CloudBlobContainer container = blobClient.getContainerReference("blobbasicscontainer");
+			// Append a random UUID to the end of the container name so that
+			// this sample can be run more than once in quick succession.
+			CloudBlobContainer container = blobClient.getContainerReference("blobbasicscontainer"
+					+ UUID.randomUUID().toString().replace("-", ""));
 
 			// Create the container if it does not exist
 			container.createIfNotExists();

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/queue/gettingstarted/QueueBasics.java

@@ -17,6 +17,7 @@
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
 import java.util.EnumSet;
+import java.util.UUID;
 
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.queue.CloudQueue;
@@ -51,7 +52,10 @@ public static void main(String[] args) throws InvalidKeyException, URISyntaxExce
 
 		try {
 			// Retrieve a reference to a queue
-			CloudQueue queue = queueClient.getQueueReference("queuebasics");
+			// Append a random UUID to the end of the queue name so that this
+			// sample can be run more than once in quick succession.
+			CloudQueue queue = queueClient.getQueueReference("queuebasics"
+					+ UUID.randomUUID().toString().replace("-", ""));
 
 			// Create the queue if it doesn't already exist
 			queue.createIfNotExists();

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/table/gettingtstarted/TableBasics.java

@@ -16,6 +16,7 @@
 
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
+import java.util.UUID;
 
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
@@ -56,7 +57,10 @@ public static void main(String[] args) throws InvalidKeyException, URISyntaxExce
 
         try {
             // Retrieve a reference to a table.
-            table = tableClient.getTableReference(tableName);
+            // Append a random UUID to the end of the table name so that this
+            // sample can be run more than once in quick succession.
+            table = tableClient.getTableReference(tableName
+                    + UUID.randomUUID().toString().replace("-", ""));
 
             // Create the table if it doesn't already exist.
             table.createIfNotExists();

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/table/payloadformat/PayloadFormat.java

@@ -64,7 +64,10 @@ public static void main(String[] args) throws InvalidKeyException, URISyntaxExce
 
 			try {
 				// Retrieve a reference to a table.
-				CloudTable table = tableClient.getTableReference("tablepayloadformat");
+				// Append a random UUID to the end of the table name so that this
+				// sample can be run more than once in quick succession.
+				CloudTable table = tableClient.getTableReference("tablepayloadformat"
+						+ UUID.randomUUID().toString().replace("-", ""));
 
 				// Create the table if it doesn't already exist.
 				table.createIfNotExists();

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/util/Utility.java

@@ -29,10 +29,13 @@ public final class Utility {
 	}
 
 	/**
-	 * Stores the storage connection strings.
+	 * MODIFY THIS!
 	 * 
+	 * Stores the storage connection string.
 	 */
-	public static final String storageConnectionString = "DefaultEndpointsProtocol=http;AccountName=myaccountname;AccountKey=myaccountkey";
+	public static final String storageConnectionString = "DefaultEndpointsProtocol=https;"
+		+ "AccountName=[MY_ACCOUNT_NAME];"
+		+ "AccountKey=[MY_ACCOUNT_KEY]";
 
 	/**
 	 * Prints out the exception information .

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

@@ -789,14 +789,6 @@ else if (client.getClass().equals(CloudQueueClient.class)) {
 
     /**
      * Takes a CorsRule and tries to upload it. Then tries to download it and compares it to the initial CorsRule.
-     * 
-     * @param rule
-     * @param client
-     *            TODO
-     * @param props
-     *            TODO
-     * @throws StorageException
-     * @throws InterruptedException
      */
     private void testCorsRules(CorsRule rule, ServiceClient client, ServiceProperties props) throws StorageException,
             InterruptedException {
@@ -811,15 +803,6 @@ private void testCorsRules(CorsRule rule, ServiceClient client, ServicePropertie
     /**
      * Takes a List of CorsRules and tries to upload them. Then tries to download them and compares the list to the
      * initial CorsRule List.
-     * 
-     * @param client
-     *            TODO
-     * @param props
-     *            TODO
-     * @param rule
-     * 
-     * @throws StorageException
-     * @throws InterruptedException
      */
     private void testCorsRules(List<CorsRule> corsRules, ServiceClient client, ServiceProperties props)
             throws StorageException, InterruptedException {
@@ -836,9 +819,6 @@ private void testCorsRules(List<CorsRule> corsRules, ServiceClient client, Servi
 
     /**
      * Checks two ServiceProperties for equality
-     * 
-     * @param propsA
-     * @param propsB
      */
     private static void assertServicePropertiesAreEqual(ServiceProperties propsA, ServiceProperties propsB) {
         if (propsA.getLogging() != null && propsB.getLogging() != null) {

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

@@ -78,17 +78,15 @@ public void testStorageCredentialsSharedKey() throws URISyntaxException, Storage
 
     @Test
     public void testStorageCredentialsSAS() throws URISyntaxException, StorageException {
-        String token = "?sp=abcde&api-version=2014-02-14&sig=1";
-
+        String token = "?sig=1&api-version=2014-02-14&sp=abcde";  
         StorageCredentialsSharedAccessSignature cred = new StorageCredentialsSharedAccessSignature(token);
-
         assertNull(cred.getAccountName());
 
         URI testUri = new URI("http://test/abc");
         assertEquals(testUri + token, cred.transformUri(testUri).toString());
 
         testUri = new URI("http://test/abc?query=a&query2=b");
-        String expectedUri = "http://test/abc?sp=abcde&query=a&api-version=2014-02-14&query2=b&sig=1";
+        String expectedUri = "http://test/abc?sig=1&api-version=2014-02-14&query=a&sp=abcde&query2=b";
         assertEquals(expectedUri, cred.transformUri(testUri).toString());
     }