Change the way the default retention policy works and fix some tests.

* Made non-null retention policy represent an uploaded policy, like other settings.
** By default retention policy is null because it doesn't apply to all services.
** A new retention policy is disabled by default.
* Fixed service property tests to handle no retention policy by default.
** These tests were already failing before this change; this fix was necessary either way.
* Removed sleep in service property tests and removed the slow tag.

Author: mirobers

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

@@ -35,7 +35,7 @@
 
 import static org.junit.Assert.*;
 
-@Category({ SlowTests.class, DevFabricTests.class, DevStoreTests.class, CloudTests.class })
+@Category({ DevFabricTests.class, DevStoreTests.class, CloudTests.class })
 public class ServicePropertiesTests {
 
     /**
@@ -48,6 +48,7 @@ public class ServicePropertiesTests {
     public void testAnalyticsDisable() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsDisable(client, props);
 
@@ -91,6 +92,7 @@ private void testAnalyticsDisable(ServiceClient client, ServiceProperties props)
     public void testAnalyticsDefaultServiceVersion() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsDefaultServiceVersion(client, props);
 
@@ -151,6 +153,7 @@ private void testAnalyticsDefaultServiceVersion(ServiceClient client, ServicePro
     public void testAnalyticsLoggingOperations() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsLoggingOperations(client, props);
 
@@ -191,6 +194,7 @@ private void testAnalyticsLoggingOperations(ServiceClient client, ServicePropert
     public void testAnalyticsHourMetricsLevel() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsHourMetricsLevel(client, props, null);
 
@@ -259,6 +263,7 @@ private void testAnalyticsHourMetricsLevel(
     public void testAnalyticsMinuteMetricsLevel() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsMinuteMetricsLevel(client, props, null);
 
@@ -327,6 +332,7 @@ private void testAnalyticsMinuteMetricsLevel(
     public void testAnalyticsRetentionPolicies() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsRetentionPolicies(client, props);
 
@@ -426,6 +432,7 @@ private void testValidDeleteRetentionPolicy(ServiceClient client, boolean enable
 
         try {
             ServiceProperties expectedServiceProperties = new ServiceProperties();
+            expectedServiceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
             expectedServiceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
 
             if (enabled) {
@@ -435,7 +442,7 @@ private void testValidDeleteRetentionPolicy(ServiceClient client, boolean enable
             } else {
                 // interval and retained versions per blob would both be ignored by the service in case the policy is not enabled
                 ServiceProperties propertiesToUpload = new ServiceProperties();
-                propertiesToUpload.getDeleteRetentionPolicy().setEnabled(false);
+                propertiesToUpload.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
                 propertiesToUpload.getDeleteRetentionPolicy().setRetentionIntervalInDays(interval);
 
                 expectedServiceProperties.getDeleteRetentionPolicy().setEnabled(false);
@@ -448,7 +455,7 @@ private void testValidDeleteRetentionPolicy(ServiceClient client, boolean enable
         finally {
             // reset the delete retention policy
             ServiceProperties disabledDeleteRetentionPolicy = new ServiceProperties();
-            disabledDeleteRetentionPolicy.getDeleteRetentionPolicy().setEnabled(false);
+            disabledDeleteRetentionPolicy.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
             callUploadServiceProps(client, disabledDeleteRetentionPolicy, null);
         }
     }
@@ -483,6 +490,7 @@ private void testInvalidDeleteRetentionPolicy(ServiceClient client, boolean enab
 
         // Arrange
         ServiceProperties serviceProperties = new ServiceProperties();
+        serviceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         serviceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
 
         if (enabled) {
@@ -522,6 +530,7 @@ public void testEmptyDeleteRetentionPolicy() throws StorageException, Interrupte
         try {
             // set up initial delete retention policy
             ServiceProperties currentServiceProperties = new ServiceProperties();
+            currentServiceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
             currentServiceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
             currentServiceProperties.getDeleteRetentionPolicy().setEnabled(true);
             currentServiceProperties.getDeleteRetentionPolicy().setRetentionIntervalInDays(5);
@@ -540,7 +549,7 @@ public void testEmptyDeleteRetentionPolicy() throws StorageException, Interrupte
         finally {
             // reset the delete retention policy
             ServiceProperties disabledDeleteRetentionPolicy = new ServiceProperties();
-            disabledDeleteRetentionPolicy.getDeleteRetentionPolicy().setEnabled(false);
+            disabledDeleteRetentionPolicy.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
             callUploadServiceProps(client, disabledDeleteRetentionPolicy, null);
         }
     }
@@ -555,6 +564,7 @@ public void testEmptyDeleteRetentionPolicy() throws StorageException, Interrupte
     public void testCloudValidCorsRules() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCloudValidCorsRules(client, props, null);
 
@@ -678,6 +688,7 @@ private void testCloudValidCorsRules(
     public void testCorsExpectedExceptions() throws StorageException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCorsExpectedExceptions(client, props, null);
 
@@ -741,6 +752,7 @@ private void testCorsExpectedExceptions(
     public void testCorsMaxOrigins() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCorsMaxOrigins(client, props, null);
 
@@ -792,6 +804,7 @@ private void testCorsMaxOrigins(
     public void testCorsMaxHeaders() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCorsMaxHeaders(client, props, null);
 
@@ -895,6 +908,7 @@ private void testCorsMaxHeaders(
     public void testOptionalServiceProperties() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
+        props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testOptionalServiceProperties(client, props);
 
@@ -977,8 +991,9 @@ else if (client.getClass().equals(CloudFileClient.class)) {
         else {
             fail();
         }
-
-        Thread.sleep(30000);
+        
+        // It may take up to 30 seconds for the settings to take effect, but the new properties are immediately
+        // visible when querying service properties.
     }
 
     private ServiceProperties callDownloadServiceProperties(ServiceClient client) throws StorageException {
@@ -1015,7 +1030,6 @@ private void testCorsRules(CorsRule rule, ServiceClient client, ServicePropertie
         } else {
             CloudFileClient fileClient = ((CloudFileClient) client);
             fileClient.uploadServiceProperties(fileServiceProperties);
-            Thread.sleep(30000);
             assertFileServicePropertiesAreEqual(fileServiceProperties, fileClient.downloadServiceProperties());
         }
     }
@@ -1039,7 +1053,6 @@ private void testCorsRules(List<CorsRule> corsRules, ServiceClient client, Servi
         } else {
             CloudFileClient fileClient = ((CloudFileClient) client);
             fileClient.uploadServiceProperties(fileServiceProperties);
-            Thread.sleep(30000);
             assertFileServicePropertiesAreEqual(fileServiceProperties, fileClient.downloadServiceProperties());
         }
     }

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

@@ -118,9 +118,9 @@ public static class CoreTestSuite {
 
     @RunWith(Suite.class)
     @SuiteClasses({ BlobOutputStreamTests.class, CloudBlobClientTests.class, CloudBlobContainerTests.class,
-            CloudBlobDirectoryTests.class, CloudAppendBlobTests.class, CloudBlockBlobTests.class, CloudPageBlobTests.class,
-            CloudBlobClientEncryptionTests.class, CloudBlobServerEncryptionTests.class, LeaseTests.class, SasTests.class,
-            PremiumBlobTestSuite.class })
+            CloudBlobDirectoryTests.class, CloudAppendBlobTests.class, CloudBlockBlobTests.class,
+            CloudPageBlobTests.class, CloudBlobClientEncryptionTests.class, CloudBlobServerEncryptionTests.class,
+            LeaseTests.class, SasTests.class })
     public static class BlobTestSuite {
     }
 

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

@@ -14,6 +14,7 @@
  */
 package com.microsoft.azure.storage.blob;
 
+import com.microsoft.azure.storage.DeleteRetentionPolicy;
 import com.microsoft.azure.storage.OperationContext;
 import com.microsoft.azure.storage.StorageCredentials;
 import com.microsoft.azure.storage.StorageException;
@@ -440,6 +441,7 @@ public static void assertAreEqual(CopyState copy1, CopyState copy2) {
 
     public static void enableSoftDelete() throws StorageException, URISyntaxException, InterruptedException {
         ServiceProperties serviceProperties = new ServiceProperties();
+        serviceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         serviceProperties.getDeleteRetentionPolicy().setEnabled(true);
         serviceProperties.getDeleteRetentionPolicy().setRetentionIntervalInDays(3);
 
@@ -450,7 +452,7 @@ public static void enableSoftDelete() throws StorageException, URISyntaxExceptio
 
     public static void disableSoftDelete() throws StorageException, URISyntaxException, InterruptedException {
         ServiceProperties serviceProperties = new ServiceProperties();
-        serviceProperties.getDeleteRetentionPolicy().setEnabled(false);
+        serviceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
 
         CloudBlobClient bClient = TestHelper.createCloudBlobClient();
         bClient.uploadServiceProperties(serviceProperties);

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

@@ -22,7 +22,7 @@ public class DeleteRetentionPolicy {
     /**
      * Indicates whether a deleted blob or snapshot is retained or immediately removed by a delete operation.
      */
-    private Boolean enabled;
+    private boolean enabled = false;
 
     /**
      * Required only if Enabled is true. Indicates the number of days that deleted blobs are retained.
@@ -32,11 +32,11 @@ public class DeleteRetentionPolicy {
     private Integer retentionIntervalInDays;
 
     /**
-     * Return a Boolean indicating whether the DeleteRetentionPolicy is enabled.
+     * Return a boolean indicating whether the DeleteRetentionPolicy is enabled.
      *
-     * @return A <code>Boolean</code> indicating whether a deleted blob or snapshot is retained or immediately removed by a delete operation.
+     * @return A <code>boolean</code> indicating whether a deleted blob or snapshot is retained or immediately removed by a delete operation.
      */
-    public Boolean getEnabled() {
+    public boolean getEnabled() {
         return this.enabled;
     }
 
@@ -50,7 +50,7 @@ public Integer getRetentionIntervalInDays() {
     }
 
     /**
-     * Set the Boolean indicating whether the DeleteRetentionPolicy is enabled.
+     * Set a boolean indicating whether the DeleteRetentionPolicy is enabled.
      * @param enabled indicates whether the DeleteRetentionPolicy is enabled.
      */
     public void setEnabled(boolean enabled) {

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

@@ -58,7 +58,6 @@ public ServiceProperties() {
         this.setHourMetrics(new MetricsProperties());
         this.setMinuteMetrics(new MetricsProperties());
         this.setCors(new CorsProperties());
-        this.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
     }
 
     /**

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

@@ -77,7 +77,7 @@ public static byte[] serializeToByteArray(final ServiceProperties properties) th
         }
 
         // Delete retention policy
-        if (properties.getDeleteRetentionPolicy() != null && properties.getDeleteRetentionPolicy().getEnabled() != null) {
+        if (properties.getDeleteRetentionPolicy() != null) {
             writeDeleteRetentionPolicy(xmlw, properties.getDeleteRetentionPolicy());
         }
 
@@ -110,10 +110,10 @@ private static void writeDeleteRetentionPolicy(final XMLStreamWriter xmlw, final
 
         // Enabled
         xmlw.writeStartElement(Constants.AnalyticsConstants.ENABLED_ELEMENT);
-        xmlw.writeCharacters(deleteRetentionPolicy.getEnabled() != null && deleteRetentionPolicy.getEnabled() ? Constants.TRUE : Constants.FALSE);
+        xmlw.writeCharacters(deleteRetentionPolicy.getEnabled() ? Constants.TRUE : Constants.FALSE);
         xmlw.writeEndElement();
 
-        if (deleteRetentionPolicy.getEnabled() != null && deleteRetentionPolicy.getEnabled()) {
+        if (deleteRetentionPolicy.getEnabled()) {
             // Include retention days and retained versions per blob
             xmlw.writeStartElement(Constants.AnalyticsConstants.DAYS_ELEMENT);
             xmlw.writeCharacters(deleteRetentionPolicy.getRetentionIntervalInDays().toString());

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlobClient.java

@@ -560,7 +560,7 @@ public void uploadServiceProperties(final ServiceProperties properties, BlobRequ
         options = BlobRequestOptions.populateAndApplyDefaults(options, BlobType.UNSPECIFIED, this);
 
         Utility.assertNotNull("properties", properties);
-        if (properties.getDeleteRetentionPolicy() != null && properties.getDeleteRetentionPolicy().getEnabled() != null
+        if (properties.getDeleteRetentionPolicy() != null
                 && properties.getDeleteRetentionPolicy().getEnabled()) {
             Utility.assertNotNull("RetentionIntervalInDays", properties.getDeleteRetentionPolicy().getRetentionIntervalInDays());
         }