Merge pull request #260 from Azure/master

Release 7.0.0 to dev

Author: mirobers

BreakingChanges.txt

@@ -1,16 +1,22 @@
-Changes in 6.0.0
+Changes in 7.0.0
+
+OTHER
+ * Upgraded Key Vault dependency to 1.0. Users of the IKey and IKeyResolver interfaces should note the interface changes in this version.
+ * The getErrorCode method of StorageExtendedErrorInformation is now deprecated. Use the corresponding methods in RequestResult and StorageException instead.
+
+Changes in 6.0.0
 
 FILE
-* Many File service APIs can now throw a URISyntaxException.
-* Changed listShares() ShareListingDetails parameter to be an enum set like what is done for listing blobs.
+ * Many File service APIs can now throw a URISyntaxException.
+ * Changed listShares() ShareListingDetails parameter to be an enum set like what is done for listing blobs.
 
 OTHER
  * DefaultEndpointsProtocol will now be explicitly included in generated connection strings.
  * Connection string parsing has been substantially re-written and expanded. Please refer to current documentation about connection string formats.
 
 Changes in 5.1.1
 OTHER
-  * Reverted the code from 5.1.0 because it contained a regression and an accidental change.
+ * Reverted the code from 5.1.0 because it contained a regression and an accidental change.
 
 Changes in 5.0.0
 

CONTRIBUTING.md

@@ -20,6 +20,7 @@ The Azure Storage development team uses Intellij. However, any preferred IDE or
 
 ### Configuration
 The only step to configure testing is to setup a configuration file or connection string via environment variables. To use the connection string route, create an environment variable named "storageConnection". To use the configuration file route, create an environment variable named "storageTestConfiguration" with the path to a TestConfigurations.xml file with this [template](https://github.com/Azure/azure-storage-java/blob/master/microsoft-azure-storage-test/res/TestConfigurations.xml).
+Alternatively, you can fill in microsoft-azure-storage-test/res/TestConfigurations.xml with the appropriate information.
 
 ### Running
 To actually run tests, right click on the test class in the Package Explorer or the individual test in the Outline and select Run As->JUnitTest. All tests or tests grouped by service can be run using the test runners in the com.microsoft.azure.storage package TestRunners file. Running all tests from the top of the package explorer will result in each test being run multiple times as the package explorer will also run every test runner.

ChangeLog.txt

@@ -1,7 +1,12 @@
-XXXX.XX.XX Version X.X.X
+2018.02.05 Version 7.0.0
+ * Support for 2017-07-29 REST version. Please see our REST api documentation and blogs for information about the related added features.
+ * Added support for soft delete feature. If a delete retention policy is enabled through the set service properties API, then blobs or snapshots can be deleted softly and retained for a specified number of days, before being permanently removed by garbage collection.
+ * When a storage request fails, the error code may now be retrieved directly from the RequestResult and StorageException classes. This error code is populated even in cases where there is no StorageExtendedErrorInformation available, such as in calls to FetchAttributes.
+ * Queue messages may now be inserted with infinite duration by specifying -1 as the timeToLiveInSeconds parameter to addMessage.
  * Improved performance of blob uploadFromFile APIs to avoid unnecessary buffering.
  * Improved performance when streaming directly from a FileInputStream to avoid unnecessary buffering.
  * Switched to using fixed length streaming mode in the HTTP client to avoid unnecessary buffering.
+ * Upgraded Key Vault dependency to 1.0.
  * Fixed a bug preventing openInputStream from working on a blob snapshot.
 
 2017.11.01 Version 6.1.0

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

@@ -17,8 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class AlwaysRetry extends RetryPolicy implements RetryPolicyFactory {
 

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

@@ -16,9 +16,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Future;
 
-import org.apache.commons.lang3.concurrent.ConcurrentUtils;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
 
 import com.microsoft.azure.keyvault.core.IKey;
 import com.microsoft.azure.keyvault.core.IKeyResolver;
@@ -32,8 +32,10 @@ public void add(IKey key)
     }
 
     @Override
-    public Future<IKey> resolveKeyAsync(String keyId)
+    public ListenableFuture<IKey> resolveKeyAsync(String keyId)
     {
-        return ConcurrentUtils.constantFuture(this.keys.get(keyId));
+        SettableFuture<IKey> future = SettableFuture.create();
+        future.set(this.keys.get(keyId));
+        return future;
     }
 }

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

@@ -338,7 +338,7 @@ public void eventOccurred(RetryingEvent eventArg) {
         catch (StorageException e) {
             assertEquals(HttpURLConnection.HTTP_NOT_FOUND, e.getHttpStatusCode());
             assertEquals("The specified container does not exist.", e.getMessage());
-            assertEquals(StorageErrorCode.RESOURCE_NOT_FOUND.toString(), e.getErrorCode());
+            assertEquals(StorageErrorCodeStrings.CONTAINER_NOT_FOUND, e.getErrorCode());
         }
         assertEquals(1, callList.size());
         assertEquals(1, globalCallList.size());
@@ -351,7 +351,7 @@ public void eventOccurred(RetryingEvent eventArg) {
         catch (StorageException e) {
             assertEquals(HttpURLConnection.HTTP_NOT_FOUND, e.getHttpStatusCode());
             assertEquals("The specified container does not exist.", e.getMessage());
-            assertEquals(StorageErrorCode.RESOURCE_NOT_FOUND.toString(), e.getErrorCode());
+            assertEquals(StorageErrorCodeStrings.CONTAINER_NOT_FOUND, e.getErrorCode());
         }
         assertEquals(1, callList.size());
         assertEquals(2, globalCallList.size());
@@ -368,7 +368,7 @@ public void eventOccurred(RetryingEvent eventArg) {
         catch (StorageException e) {
             assertEquals(HttpURLConnection.HTTP_NOT_FOUND, e.getHttpStatusCode());
             assertEquals("The specified container does not exist.", e.getMessage());
-            assertEquals(StorageErrorCode.RESOURCE_NOT_FOUND.toString(), e.getErrorCode());
+            assertEquals(StorageErrorCodeStrings.CONTAINER_NOT_FOUND, e.getErrorCode());
         }
         assertEquals(1, callList.size());
         assertEquals(2, globalCallList.size());
@@ -422,7 +422,7 @@ public void eventOccurred(RequestCompletedEvent eventArg) {
         catch (StorageException e) {
             assertEquals(HttpURLConnection.HTTP_NOT_FOUND, e.getHttpStatusCode());
             assertEquals("The specified container does not exist.", e.getMessage());
-            assertEquals(StorageErrorCode.RESOURCE_NOT_FOUND.toString(), e.getErrorCode());
+            assertEquals(StorageErrorCodeStrings.CONTAINER_NOT_FOUND, e.getErrorCode());
         }
 
         assertEquals(2, sendingCallList.size());

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

@@ -14,12 +14,8 @@
  */
 package com.microsoft.azure.storage;
 
-import com.microsoft.azure.storage.blob.BlobOutputStream;
-import com.microsoft.azure.storage.blob.BlobRequestOptions;
-import com.microsoft.azure.storage.blob.BlobTestHelper;
-import com.microsoft.azure.storage.blob.CloudBlobClient;
-import com.microsoft.azure.storage.blob.CloudBlobContainer;
-import com.microsoft.azure.storage.blob.CloudBlockBlob;
+import com.microsoft.azure.storage.blob.*;
+import com.microsoft.azure.storage.core.BaseRequest;
 import com.microsoft.azure.storage.core.SR;
 import com.microsoft.azure.storage.core.Utility;
 import com.microsoft.azure.storage.queue.CloudQueue;
@@ -476,4 +472,45 @@ private static String generateRandomContainerName() {
         String containerName = "container" + UUID.randomUUID().toString();
         return containerName.replace("-", "");
     }
+
+    @Test
+    public void testErrorCodeFromHeader() throws URISyntaxException, StorageException, IOException {
+        CloudBlobClient blobClient = TestHelper.createCloudBlobClient();
+        CloudBlobContainer container = blobClient.getContainerReference(generateRandomContainerName());
+
+        CloudAppendBlob appendBlob = container.getAppendBlobReference("testAppend");
+
+        try {
+            container.createIfNotExists();
+            OperationContext ctx = new OperationContext();
+            appendBlob.createOrReplace();
+
+            // Verify that the error code is set on a non HEAD request
+            try {
+                appendBlob.delete(DeleteSnapshotsOption.NONE, AccessCondition.generateIfMatchCondition("garbage"),
+                        null, ctx);
+            }
+            catch (Exception e) {
+                // Validate that the error code is set on the exception and the result
+                assertEquals(((StorageException)e).getErrorCode(), StorageErrorCodeStrings.CONDITION_NOT_MET);
+                assertEquals(ctx.getLastResult().getErrorCode(), StorageErrorCodeStrings.CONDITION_NOT_MET);
+            }
+
+            // Verify that the error code is set on a HEAD request
+            try {
+                appendBlob.downloadAttributes(AccessCondition.generateIfMatchCondition("garbage"), null, ctx);
+            }
+            catch (Exception e) {
+                assertEquals(((StorageException)e).getErrorCode(), StorageErrorCodeStrings.CONDITION_NOT_MET);
+                assertEquals(ctx.getLastResult().getErrorCode(), StorageErrorCodeStrings.CONDITION_NOT_MET);
+            }
+
+            // Verify that the ErrorCode is not set on a successful request
+            appendBlob.delete(DeleteSnapshotsOption.NONE, null, null, ctx);
+            assertEquals(ctx.getLastResult().getErrorCode(), null);
+        }
+        finally {
+            container.deleteIfExists();
+        }
+    }
 }