Merge pull request #328 from Azure/mar18

Mar18

Author: rickle-msft

BreakingChanges.txt

@@ -1,4 +1,10 @@
-Changes in 7.0.0
+Changes in 8.0.0
+
+OTHER
+ * Upgraded the language version to Java 7.
+ * Updated the Jackson-Core dependency to version 2.9.4 to pull in security fix.
+
+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.

ChangeLog.txt

@@ -1,3 +1,11 @@
+2018.06.26 Version 8.0.0
+ * Support for 2018-03-28 REST version. Please see our REST API documentation and blogs for information about the related added features.
+ * Added support for static website properties.
+ * Added support for the getAccountInfo feature. Sku name and account kind may be retrieved using a CloudBlobClient, CloudBlobContainer, or CloudBlob with SharedKey or SAS.
+ * Added support for putBlockFromURI. A block may be created with another block blob as its source.
+ * Upgraded the language version to Java 7.
+ * Updated the Jackson-Core dependency to version 2.9.4 to pull in security fix.
+
 2018.05.22 Version 7.1.0
  * Support for 2017-11-09 REST version. Please see our REST API documentation and blogs for information about the related added features.
  * Added OAuth token support for authentication with HTTPS requests.

README.md

@@ -32,7 +32,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>7.0.0</version>
+	<version>8.0.0</version>
 </dependency>
 ```
 
@@ -50,7 +50,7 @@ To download a copy of the source code, click "Download ZIP" on the right side of
 
 ## Minimum Requirements
 
-* Java 1.6+
+* Java 1.7+
 * [Jackson-Core](https://github.com/FasterXML/jackson-core) is used for JSON parsing. 
 * (Optional) [SLF4J](http://www.slf4j.org/) is a logging facade.
 * (Optional) [SLF4J binding](http://www.slf4j.org/manual.html) is used to associate a specific logging framework with SLF4J.

microsoft-azure-storage-samples/pom.xml

@@ -16,8 +16,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml

@@ -16,8 +16,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
         </plugins>

microsoft-azure-storage-test/res/TestConfigurations.xml

@@ -1,6 +1,7 @@
 <TestConfigurations>
 <TargetTestTenant>ProductionTenant</TargetTestTenant>
 <TargetPremiumBlobTenant>ProductionTenant</TargetPremiumBlobTenant>
+<TargetCopySourceTenant>ProductionTenant</TargetCopySourceTenant>
 <TenantConfigurations>
   <TenantConfiguration>
     <TenantName>DevStore</TenantName>

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

@@ -23,7 +23,6 @@
 import com.microsoft.azure.storage.TestRunners.CloudTests;
 import com.microsoft.azure.storage.TestRunners.DevFabricTests;
 import com.microsoft.azure.storage.TestRunners.DevStoreTests;
-import com.microsoft.azure.storage.TestRunners.SlowTests;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -49,6 +48,7 @@ public void testAnalyticsDisable() throws StorageException, InterruptedException
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsDisable(client, props);
 
@@ -93,6 +93,7 @@ public void testAnalyticsDefaultServiceVersion() throws StorageException, Interr
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsDefaultServiceVersion(client, props);
 
@@ -154,6 +155,7 @@ public void testAnalyticsLoggingOperations() throws StorageException, Interrupte
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsLoggingOperations(client, props);
 
@@ -196,6 +198,7 @@ public void testAnalyticsHourMetricsLevel() throws StorageException, Interrupted
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         testAnalyticsHourMetricsLevel(client, props, null);
 
         client = TestHelper.createCloudQueueClient();
@@ -264,6 +267,7 @@ public void testAnalyticsMinuteMetricsLevel() throws StorageException, Interrupt
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsMinuteMetricsLevel(client, props, null);
 
@@ -333,6 +337,7 @@ public void testAnalyticsRetentionPolicies() throws StorageException, Interrupte
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testAnalyticsRetentionPolicies(client, props);
 
@@ -434,6 +439,7 @@ private void testValidDeleteRetentionPolicy(ServiceClient client, boolean enable
             ServiceProperties expectedServiceProperties = new ServiceProperties();
             expectedServiceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
             expectedServiceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
+            expectedServiceProperties.setStaticWebsiteProperties(new StaticWebsiteProperties());
 
             if (enabled) {
                 expectedServiceProperties.getDeleteRetentionPolicy().setEnabled(true);
@@ -532,6 +538,7 @@ public void testEmptyDeleteRetentionPolicy() throws StorageException, Interrupte
             ServiceProperties currentServiceProperties = new ServiceProperties();
             currentServiceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
             currentServiceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
+            currentServiceProperties.setStaticWebsiteProperties(new StaticWebsiteProperties());
             currentServiceProperties.getDeleteRetentionPolicy().setEnabled(true);
             currentServiceProperties.getDeleteRetentionPolicy().setRetentionIntervalInDays(5);
             callUploadServiceProps(client, currentServiceProperties, null);
@@ -554,6 +561,79 @@ public void testEmptyDeleteRetentionPolicy() throws StorageException, Interrupte
         }
     }
 
+    @Test
+    public void testValidStaticWebsiteProperties() throws StorageException, InterruptedException {
+        ServiceClient client = TestHelper.createCloudBlobClient();
+        // average setting
+        testValidStaticWebsiteProperties(client, true, "index.html", "errors/error/404error.html");
+
+        // disabled setting
+        testValidStaticWebsiteProperties(client, false, "index.html", "errors/error/404error.html");
+    }
+
+    private void testValidStaticWebsiteProperties(ServiceClient client, boolean enabled, String index, String pathTo404) throws InterruptedException, StorageException {
+        try {
+            ServiceProperties expectedServiceProperties = new ServiceProperties();
+            expectedServiceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+            expectedServiceProperties.setStaticWebsiteProperties(new StaticWebsiteProperties());
+            expectedServiceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
+
+            if (enabled) {
+                expectedServiceProperties.getStaticWebsiteProperties().setEnabled(true);
+                expectedServiceProperties.getStaticWebsiteProperties().setIndexDocument(index);
+                expectedServiceProperties.getStaticWebsiteProperties().setErrorDocument404Path(pathTo404);
+                callUploadServiceProps(client, expectedServiceProperties, null);
+            } else {
+                // index document and error document path will be ignored by the service when the properties are not enabled.
+                ServiceProperties propertiesToUpload = new ServiceProperties();
+                propertiesToUpload.setStaticWebsiteProperties(new StaticWebsiteProperties());
+                propertiesToUpload.getStaticWebsiteProperties().setIndexDocument(index);
+                propertiesToUpload.getStaticWebsiteProperties().setErrorDocument404Path(pathTo404);
+
+                expectedServiceProperties.getStaticWebsiteProperties().setEnabled(false);
+                callUploadServiceProps(client, propertiesToUpload, null);
+            }
+
+            // verify
+            assertServicePropertiesAreEqual(expectedServiceProperties, callDownloadServiceProperties(client));
+        }
+        finally {
+            // disable the static websites
+            ServiceProperties disabledStaticWebsiteProperties = new ServiceProperties();
+            disabledStaticWebsiteProperties.setStaticWebsiteProperties(new StaticWebsiteProperties());
+            callUploadServiceProps(client, disabledStaticWebsiteProperties, null);
+        }
+    }
+
+    @Test
+    public void testEmptyStaticWebsiteProperties() throws StorageException, InterruptedException {
+        ServiceClient client = TestHelper.createCloudBlobClient();
+
+        // set up initial static website properties
+        ServiceProperties currentServiceProperties = new ServiceProperties();
+        StaticWebsiteProperties properties = new StaticWebsiteProperties();
+        properties.setEnabled(true);
+        properties.setIndexDocument("index.html");
+        properties.setErrorDocument404Path("path/to/404");
+        currentServiceProperties.setStaticWebsiteProperties(properties);
+        currentServiceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
+        currentServiceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        callUploadServiceProps(client, currentServiceProperties, null);
+
+        // verify
+        assertServicePropertiesAreEqual(currentServiceProperties, callDownloadServiceProperties(client));
+
+        // try to upload empty properties
+        ServiceProperties emptyServiceProperties = new ServiceProperties();
+        emptyServiceProperties.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
+        emptyServiceProperties.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        emptyServiceProperties.setStaticWebsiteProperties(new StaticWebsiteProperties());
+        callUploadServiceProps(client, emptyServiceProperties, null);
+
+        // verify
+        assertServicePropertiesAreEqual(emptyServiceProperties, callDownloadServiceProperties(client));
+    }
+
     /**
      * Test CORS with different rules.
      *
@@ -565,6 +645,7 @@ public void testCloudValidCorsRules() throws StorageException, InterruptedExcept
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCloudValidCorsRules(client, props, null);
 
@@ -689,6 +770,7 @@ public void testCorsExpectedExceptions() throws StorageException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCorsExpectedExceptions(client, props, null);
 
@@ -753,6 +835,7 @@ public void testCorsMaxOrigins() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCorsMaxOrigins(client, props, null);
 
@@ -805,6 +888,7 @@ public void testCorsMaxHeaders() throws StorageException, InterruptedException {
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testCorsMaxHeaders(client, props, null);
 
@@ -909,6 +993,7 @@ public void testOptionalServiceProperties() throws StorageException, Interrupted
         ServiceClient client = TestHelper.createCloudBlobClient();
         ServiceProperties props = new ServiceProperties();
         props.setDeleteRetentionPolicy(new DeleteRetentionPolicy());
+        props.setStaticWebsiteProperties(new StaticWebsiteProperties());
         props.setDefaultServiceVersion(Constants.HeaderConstants.TARGET_STORAGE_VERSION);
         testOptionalServiceProperties(client, props);
 
@@ -991,7 +1076,7 @@ else if (client.getClass().equals(CloudFileClient.class)) {
         else {
             fail();
         }
-        
+
         // It may take up to 30 seconds for the settings to take effect, but the new properties are immediately
         // visible when querying service properties.
     }
@@ -1144,6 +1229,16 @@ private static void assertServicePropertiesAreEqual(ServiceProperties propsA, Se
             assertNull(propsA.getDeleteRetentionPolicy());
             assertNull(propsB.getDeleteRetentionPolicy());
         }
+
+        if (propsA.getStaticWebsiteProperties() != null && propsB.getStaticWebsiteProperties() != null) {
+            assertEquals(propsA.getStaticWebsiteProperties().getEnabled(), propsB.getStaticWebsiteProperties().getEnabled());
+            assertEquals(propsA.getStaticWebsiteProperties().getIndexDocument(), propsB.getStaticWebsiteProperties().getIndexDocument());
+            assertEquals(propsA.getStaticWebsiteProperties().getErrorDocument404Path(), propsB.getStaticWebsiteProperties().getErrorDocument404Path());
+        }
+        else {
+            assertNull(propsA.getStaticWebsiteProperties());
+            assertNull(propsB.getStaticWebsiteProperties());
+        }
     }
 
     /**